Merge "Clock Carousel Card Color Fix" into udc-qpr-dev