Merge "Tweak FingerprintDialog" into pi-dev