Merge "Fix ViewRootImpl handling of content changes, fix ViewPager parenting"