[WIP] Status bar clock mods (2/2)

Squished port from jb43

TODO: Decide on a settings menu structure... leave cm's intact? or replace? (replacing === work to maintain)

Change-Id: I21b98e94f3828a27b3f8acc157e3ea3b0005e00c