Merge "Fix Positioning of large custom clocks within frame" into tm-qpr-dev