Settings: disable expanded desktop on power menu disable

If expanded desktop is enabled while the option for expanded desktop
setting is disabled, expanded desktop will remain active and the user
will not be able to disable expanded desktop without reenabling the
setting.

Change-Id: Ia91e34e5ce9f8680f64b81e5f79c2df6f0639bb2
Settings: removed "Status bar visible" expanded desktop setting for devices without navbar

On devices without navigation bar, expanded desktop is only useful
for hiding the status bar when the apps don't hide them.
"Status bar visible" setting is a no-op.

Change-Id: I16a31ec6e10c7ed11600e3b1a1d9b631f31af55e
Settings: remove Pie control for devices without navbar

Change-Id: Ie0e8994436bce1848f540b50bd15bce77276808d
Merge "Settings: remove Pie control for devices without navbar" into cm-10.1
Add option for extra pie button

Change-Id: Ie5a085e8518e3a00109dbb7316df20e8956cb0de
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1

Conflicts:
	src/com/android/settings/cyanogenmod/SystemSettings.java

Change-Id: I4e51e281ce08019715e89db370d2f21803ce0c35
Merge remote-tracking branch 'sgt7/cm-10.1' into cm-10.1-sgt7