Merge "Cleanup NestedScrollSource.Drag usages" into main