Merge "Refactor FingerprintDialog to BiometricDialog" into pi-dev