Merge "Fix issue #13366. Take account of stackFromBottom in computeVerticalScrollOffset()."