Merge "Save Scroller position"