Merge "Fix a regression from miss detect cross-task target." into udc-dev