Merge "Revert "Replace split shade with dual shade when scenes enabled"" into main