Merge "QS: Revert change to when user switcher is shown"