Merge "Crash if Shade window config forwarder is instantiated when the flag is off" into main