Merge "Clean up status bar date & time code" into cm-10.2