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