Merge "Make WebViewFactory more robust." into lmp-dev