Merge "Do not reset incorrect password attempts after biometric authentication" into rvc-dev