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