Merge "Copy over the scroll position for the scrolling layer" into jb-dev