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