Merge "Clock text adjustment for large text (2/2)" into udc-dev