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

Change-Id: Iee30b701c208d29f7391c7a7368d1a5028d72f35