Merge "Fix icon touch dialog in Enrolling page" into udc-dev