Merge "Deprecate provideDataStream API" into main