Merge "Make BiometricPrompt credential UI closer to Settings" into rvc-dev