Fix display regressions related to new ViewPager page switching