Merge "Fix WebView loading logic to allow changing provider if current disabled"