Merge pull request #3585 from Wikia/VE-1100

VE-1100 Fix back button behavior in VE, using fix from upstream