Merge "Fix bugs with QS customizer when split shade is active." into sc-v2-dev