Merge "Saving scroll position when entering edit mode" into main