Immersive mode changes based on #2218

Closes #2218