Merge "Add user switcher back to QS"