Merge "Fix display of BiometricPrompt wipe warning dialogs" into rvc-dev