Merge "Fix flickering with TabLayout + ViewPager" into lmp-mr1-ub-dev