Merge "Centre clock text on visible characters instead of : character" into cw-f-dev am: ad7c7acad6
am: 43b08e2fb3

Change-Id: I62153920f518f43da399d30cc326f968035d9f34