Merge "Send the correct pointer id when transitioning from dragging to delegating state." into main