Merge "Fix runaway scroll capture" into sc-dev