Merge "Set pointer icon when drag starts" into main