Merge "General Fallback for BiometricPrompt" into main