Merge "Fix scroll amount calculation in ViewRootImpl" into nyc-dev am: b1e24209f1 am: 33508a49e8
am: f7c1294fcf

* commit 'f7c1294fcf7d7717f62e983078ac20c8338047dd':

Change-Id: I2551c9c7a1d5774a3121f2c54b817708fa958876