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

Change-Id: Iee76ad95bfa33815be9348043c9007a5b1fff8bc