Merge "Remove StatusBarState.FULLSCREEN_USER_SWITCHER"