Fix Chrome bug where popstate could still reset scroll position

Change-Id: I3418b2e446a210a406daacc1321103df1f09caa1
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/486
Merge "Fix Chrome bug where popstate could still reset scroll position"