Merge "Fixed face enroll intro button issue" into sc-v2-dev