Merge "finalise scrolling before checking scroll position"