Settings: Add back expanded desktop settings.

Change-Id: If36282d1bf110baaa6a3a6d4807081b06dcc086b
Merge branch 'cm-11.0' into martincz