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

Change-Id: I39ffd837d75c40ca0cb33c96d7cb501045ef457f