Merge branch 'CscOverlayPatches_master' into 'master'

Prevent CSC strip phi-ordering work-around being used for MC Overlay

See merge request !24198 (merged)