Merge "Bring back two-line layout for status bar date." into cm-11.0