Merge "TabLayout + ViewPager improvements" into nyc-dev