Base: fix Immersive mode

also while im here
fix possible FCs for QuickSettings
cleanup

Change-Id: I628bb84e8bf7c63024913d4388fa0343fe34c326