Merge "Snappier clock carousel" into udc-dev