Merge "Disable DX workaround for 611-checker-simplify-if"