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

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