Merge "Mark BiometricUnlockController as @Singleton"