Merge "Merge "Hide QS whenever user switch occurs" into sc-dev am: cbd9c859 am: d4b86f35" into sc-v2-dev-plus-aosp