Merge "Revert "TabLayout + ViewPager improvements"" into nyc-dev