Merge "Tweak FingerprintDialog" into pi-dev am: b57843059a
am: 4dd84f9c92

Change-Id: Iffc554493e09da5202d27f66cf32956dae03fc59