Merge "Fixes an issue where the padding to the clock was wrong" into qt-r1-dev