AUI-1173 - Fix restoring scroll after navigate

The current solution didn't work on Safari (aka on iPhone), so
it has been simplified and fixed.