Merge "Fix tests that were flaky due to ViewPager interactions" into sc-mainline-prod