Merge "Fix scroll position calculation when clipToPadding is false" into lmp-dev