am 6cdaab18: Merge "Fix scroll position calculation when clipToPadding is false" into lmp-dev

* commit '6cdaab18f323108f599d54d636f8fcc9bd7af278':
  Fix scroll position calculation when clipToPadding is false