[Android WebAPKs] Don't navigate WebAPK when launching it from launcher

chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappDataStorage.java

Index: chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappDataStorage.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappDataStorage.java b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappDataStorage.java
index bc4d7e1d098bb8925aa9818868a4e12ecce9a993..832a68cfab45024e6a4d903d710a0231fd7641af 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappDataStorage.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappDataStorage.java
@@ -228,12 +228,17 @@ public class WebappDataStorage {
         // they are present, and update if necessary.
         String url = mPreferences.getString(KEY_URL, URL_INVALID);
         if (url.equals(URL_INVALID)) {
-            url = IntentUtils.safeGetStringExtra(shortcutIntent, ShortcutHelper.EXTRA_URL);
-            editor.putString(KEY_URL, url);
-            updated = true;
+            String intentUrl =
+                    IntentUtils.safeGetStringExtra(shortcutIntent, ShortcutHelper.EXTRA_URL);
+            if (intentUrl != null) {
+                url = intentUrl;
+                editor.putString(KEY_URL, url);
+                updated = true;
+            }
         }
 
-        if (mPreferences.getString(KEY_SCOPE, URL_INVALID).equals(URL_INVALID)) {
+        if (mPreferences.getString(KEY_SCOPE, URL_INVALID).equals(URL_INVALID)
+                && !url.equals(URL_INVALID)) {
             String scope = IntentUtils.safeGetStringExtra(
                     shortcutIntent, ShortcutHelper.EXTRA_SCOPE);
             if (scope == null) {