Code fixes

* remove dependency for immersive mode, we want it to enable it freely, not just by disabling it
* wrong redirection to drawables
* expand desktop code kang derp

Change-Id: I42f558385f581ac933550477a12310b343470fde