Merge "Fix Biometric Prompt credential transition delay on face fail" into main