am 7a51fbbf: am c3549480: am cc19a53d: Fix 2271080 - .lang.IllegalArgumentException: no dialog with id 1 was ever shown via Activity#showDialog on CreateShortcut

Merge commit '7a51fbbfb55c30921f0677b84483ef030e397d6f'

* commit '7a51fbbfb55c30921f0677b84483ef030e397d6f':
  Fix 2271080 - .lang.IllegalArgumentException: no dialog with id 1 was ever shown via

src/com/android/launcher2/Launcher.java

@@ -1908,7 +1908,11 @@ public final class Launcher extends Activity
         }
 
         private void cleanup() {
-            dismissDialog(DIALOG_CREATE_SHORTCUT);
+            try {
+                dismissDialog(DIALOG_CREATE_SHORTCUT);
+            } catch (Exception e) {
+                // An exception is thrown if the dialog is not visible, which is fine
+            }
         }
 
         /**