Merge "Refactor StatusBarState out of StatusBar"