Merge "Ensure TabLayout + ViewPager selected item are in sync" into lmp-mr1-ub-dev