Merge "Improve handling of devices without a WebView."