Merge branch 'backport-IntelLLVM-no-icpx-on-Windows'