Merge "Make auto-scroll less aggressive." into main