Merge "Update remaining enrollment affordance alpha" into sc-dev