Move expanded desktop to display settings

Inspired from this commit:
https://github.com/CyanogenMod/android_packages_apps_Settings/commit/a2b5ff1542e802f4257e7a7746ceb9e1c9cf333e

Change-Id: If98590f462dae130b7e9c2d725ae6a20071ff570