Merge "Revert^2 "[bc25] Add Dual Shade invocation zone detection."" into main