Merge "Revert line that could wrongly initialize RecentsView scroll" into tm-dev