Merge "Fix small style issues in ViewPager." into nyc-support-24.1-dev