Merge "Improve clock carousel" into udc-dev