Merge "Page resets when scrolling slowly fix" into main