Revert "Revert "Settings: Add back expanded desktop settings."

This reverts commit 7b6afee6ba74705826271e316da9ba0ef9870915.