Merge "Clocks now correctly respond to font setting changes" into tm-qpr-dev