Merge "API updates to ScrollFeedbackProvider" into main