Merge "[bc25] Refactor ShadeInteractor for Dual Shade Overlays." into main