Merge "Second pass for TabLayout / ViewPager tests" into mnc-ub-dev