Merge "Support the ability to enroll face unlock first" into main