Merge "Fix testStressSwipeToOverview" into sc-v2-dev