Merge "Mark shade as opaque when scrims are visible" into sc-dev