Merge "Fixed non-resetting scroll state" into main