Settings: Add back expanded desktop settings.

Change-Id: If36282d1bf110baaa6a3a6d4807081b06dcc086b

Conflicts:
	res/xml/system_ui_settings.xml