Merge "[TP] Reuse clock views in clock carousel" into tm-qpr-dev