Merge "[TP] Clock Settings" into tm-qpr-dev