Merge "Fix testStressSwipeToOverview" into sc-dev