Merge "STL remove NestedScrollToScene 2/2" into main