Merge "Clean up some QS user switcher colors"