Merge "[TP] Fix digital clocks in clock carousel" into tm-qpr-dev