Merge "Clock color on preview renderer" into udc-dev