Merge "Update QS user switcher colors to spec" into lmp-dev