Merge "Animate UDFPS enroll affordance" into sc-dev