Merge "Add a flag for status bar user switcher"