Merge "Hide QS whenever user switch occurs" into sc-dev