Merge "Fix testDragToFolder test" into main