Merge "Fix attempt for testDragToFolder" into main