Merge "ClearBiometricRecognized when user switches" into rvc-dev