Merge "Minor cleanup for FingerprintDialog"