Merge "Remove flakiness from ViewPager "smooth" tests" into mnc-ub-dev