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

Change-Id: Id92ec78e061736e4b269226cecc8b73e5b19be39