Merge "Fix ScrollView and HorizontalScrollView overscroll retraction" into main