Merge "Adjusting minimum touch size for clock color button" into udc-dev