Re-add lockscreen music controls toggle.

Change-Id: I70fb6c0d20caad7af01a45b4a9374eb107a554a3
Fix hidden navigation bar in expanded desktop mode not being correctly
reflected.

Change-Id: Ie40951c0787d3960a8e6e3b94544632f7633a376
Merge branch 'cm-10.2' of git://github.com/PAC-man/android_frameworks_base into PAC4.3