Grid no longer resets scrollpos on state change (#15422)

Change-Id: I3fde618a47ad9bb0f8b79c52feb10dd74a387203