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

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