Merge "Fix WebViewUpdateService timeout code." into lmp-dev