Revert "Revert "Status bar clock""

This reverts commit 3a30167662b71b3d4ea1e8aa32940de9423849e1.
Revert "Revert "Statusbar clock: fix am/pm selection""

This reverts commit 7925008740d7af4f4764a182e92595da0d2c2620.