Merge "Making multiuser button work in collapsed QS in split shade" into sc-v2-dev