Merge "QS: Update user switcher details" into lmp-dev