Merge "Make QS switch to Split Shade on unfold" into main