Merge "Fix BiometricPrompt for smaller screens"