Merge "Fix failing DeleteDropTargetTest" into main