Merge "STL NestedScrollHandler uses the current Content" into main