Merge "[TP] Clock color updates" into tm-qpr-dev