Merge "Fixes an issue where the padding to the clock was wrong" into qt-r1-dev am: c2abf3b9e9
am: 272dfed902

Change-Id: Ic32df19a3a1fd21ab1aea7ff0297168ceb8f857c