Fix a number of scroll related bugs, including https://app.asana.com/0/15264711598672/20217750982650