Merge "[Biometric Onboarding & Edu] Update Set up Fingerprint/Face Unlock page" into main