Merge "Fix up the WebCoreThreadWatchdog" into jb-dev