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
Fix brightness dialog layout.

This reverts part of change I83e8f7eae65d5f40dd7aeb2b663bc1fc3d5324d2.

Change-Id: I1f685357776dcac9c93e592e274acdf0497f4161
Merge remote-tracking branch 'cm/cm-10.2' into dc43