Merge "Don't pass QS expand state to NPVC in split shade mode." into sc-v2-dev