Save scroll position when restoring

Note that this only works if the orientation has not changed. If
it does this will be off by a bit.

Change-Id: Ia96b172ba69bd96e2d902f8189e54c9635922163