Merge "Fix testDragToFolder()" into main