Merge "Align assets and colors for biometric enroll intros" into sc-dev