Merge "Improve clock carousel perf" into udc-dev