Merge "Make user switcher appear inside the QS panel" into lmp-dev