Merge "Polish FingerprintDialog" into pi-dev am: 7b97503caa
am: e14a22058b

Change-Id: If771a3bd126521beccedfe262a4e8723cea2d47f