Merge "End scroller if it has already reached the final position" into sc-dev