Merge "Clock UX Polish & code cleanup" into udc-dev