Merge "Fix scroll amount calculation in ViewRootImpl" into nyc-dev