Merge "UX Polishing with new Biometric APIs" into main