Merge "Fix ViewPager crash for a11y z order." into nyc-dev