Merge "BiometricPrompt test cleanup" into main