Re-add lockscreen music controls toggle.

Change-Id: I70fb6c0d20caad7af01a45b4a9374eb107a554a3
Fix Google Now animation.

Change-Id: I32efb2eb6dde3e1b45f4a7dd708003a85cfcc78b
Merge "Re-add lockscreen music controls toggle." into cm-10.2
Merge "Fix Google Now animation." into cm-10.2
Merge branch 'cm-10.2' of https://github.com/CyanogenMod/android_frameworks_base into cm-10.2