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

* commit '33508a49e84db07be56148f53bf4c9c5404161c7':

Change-Id: I69e02ceadd4cbd2b09babdcc74a7353cc5b0d4e2