Merge "Change the status bar clock's measuring scheme" into tm-dev