Merge "[WPP2] Get and set clock size in settings" into tm-qpr-dev