Merge "Apply nosensor for face unlock enroll activities" into main