Merge "Re-add missing toolbar for FingerprintDialog sample." into oc-dev am: 21fbeace am: 28672a5f am: 13931b8c Change-Id: I2930f114696133e9708d72c9f96ee47d7cdc0661