Merge "Revert "[Biometric Onboarding & Edu] Update Set up Fingerprint/F..."" into main