AUI-1173 - Fix restoring scroll after navigate