Fix empty page being activated if music controls are disabled and music
is playing.

Change-Id: I76e00e4c58dc86ce0bf4e88c0e6be551950b6969
Bring back two-line layout for status bar date.

Change-Id: I4bf7ce61b22da89b3b8c1a3f00e077461061f7b9
Merge "Fix empty page being activated if music controls are disabled and music is playing." into cm-10.2
merge CyanogenMod

Change-Id: I3df578e889ebddc4bf27c47ca67c2e9a67a02123