Merge "Post-enroll settings screen shows class 3 strings" into udc-dev