Merge "Expand DragStartHelperTest" into nyc-support-25.1-dev