Merge "Add EXTRA_PROXY_INFO to incompatibilities.txt." into sc-dev