Merge "Stop DeleteDropTarget from setting the containerId of items to NO_ID" into tm-qpr-dev