Merge "Don't reset the biometricUnlockState until the next time keyguard shows" into main