Merge "FaceEnrollIntro requires scroll for accessibility" into 24D1-dev