Merge "Add the user switcher chip to the status bar"