Merge "Make TabLayout scroll to the current ViewPager page" into nyc-dev