Merge "Prevent WebKit updates in loadViewState case"