Merge "Only setup SecondaryDropTarget in onDragStart" into tm-dev