Merge "Only defer remove starting window if the collecting target below task" into udc-qpr-dev