Revert "Base: Adjustments to immersive mode"

This reverts commit 42f92df02329f1905944568f100192dee0ba5ec9.
Fix Derps

Change-Id: If6225bf5a5ee8f6892b7b053bf24a6b43edc9663