Merge "Fix UI bugs for udfps enroll in settings."