Merge "Don't disable QS when in split shade" into sc-v2-dev