Merge "Add rest to unlock progress bar to BiometricPrompt" into main