Merge "Third pass for testing TabLayout with ViewPager" into mnc-ub-dev