Merge "Fix ViewPager.DecorView annotation inheritance DO NOT MERGE ANYWHERE" into nyc-dev