Revert "Revert Reimplement expanded desktop on top of immersive mode."