Fullscreen Statusbar Cleanup

Change-Id: I3cb125041d923a26ea18351aded86d1e41b26bf0