Settings: Add back expanded desktop settings.

Change-Id: If36282d1bf110baaa6a3a6d4807081b06dcc086b
Use holo alert drawable

These instances of the GB icon got missed in the big feature merge.

Change-Id: I4725be79af6e51e1aa5d575a32232bbac0a11275
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_Settings into CyanogenMod-cm-11.0

Conflicts:
	res/values/cm_arrays.xml