Merge "Revert "Tidy up TabLayout + ViewPager integration"" into lmp-mr1-ub-dev