Merge "[Dual Shade] Replace most references to DualShade flag with the setting." into main