Merge "Updated EdgeEffect parameters for overscroll stretch" into sc-dev