Merge "Migrate away from WebView fallback logic."