am 98e955d2: am 20d6caf8: Merge "Fix issue #13366. Take account of stackFromBottom in computeVerticalScrollOffset()."

* commit '98e955d295441636ba19688e18a8223691256d2c':
  Fix issue #13366. Take account of stackFromBottom in computeVerticalScrollOffset().