Merge "Finalize BiometricPrompt Strings" into main