Settings: Add back expanded desktop settings.

Change-Id: If36282d1bf110baaa6a3a6d4807081b06dcc086b

Conflicts:

	res/values/cm_arrays.xml
	res/xml/system_ui_settings.xml
	src/com/android/settings/cyanogenmod/SystemUiSettings.java