Merge "Use pattern subtitle string on all enroll stages" into sc-dev