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