Merge "[Biometric Onboarding & Edu] move screen lock settings to choose lock" into main