Merge "Tweak FingerprintDialog layout"