Merge "Fix deadlock of WebViewCoreThread"