Merge "Overscroll DSL exposes the current OverscrollScope (1/2)" into main