Merge "Adjust clock carousel guideline margin" into udc-dev