Merge "Avoid scrolling within edgeSensitivityWidth in overview tests" into sc-v2-dev