Merge "Improved the behavior of overscroll" into sc-dev