Merge "Refactoring testDragIcon() test" into main