Merge "Remove workaround of delaying remove task" into udc-dev