Merge "Slight updates to UDFPS enroll affordances" into sc-dev