Merge remote-tracking branch 'origin/upstream' into trunk

# Conflicts:
#	src/com/android/launcher3/provider/LauncherDbUtils.java

src/com/android/launcher3/provider/LauncherDbUtils.java

@@ -25,6 +25,7 @@
 import android.content.pm.ShortcutInfo;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteException;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.drawable.Icon;
@@ -173,13 +174,15 @@ public static void migrateLegacyShortcuts(Context context, SQLiteDatabase db) {
                     null);
         }
 
-        // Compat users upgrade from Lawnchair 13.
-        removeColumn(db, Favorites.TABLE_NAME, "iconPackage");
-        removeColumn(db, Favorites.TABLE_NAME, "iconResource");
-
         // Drop the unused columns
-//        db.execSQL("ALTER TABLE " + Favorites.TABLE_NAME + " DROP COLUMN iconPackage;");
-//        db.execSQL("ALTER TABLE " + Favorites.TABLE_NAME + " DROP COLUMN iconResource;");
+        try {
+            db.execSQL("ALTER TABLE " + Favorites.TABLE_NAME + " DROP COLUMN iconPackage;");
+            db.execSQL("ALTER TABLE " + Favorites.TABLE_NAME + " DROP COLUMN iconResource;");
+        } catch (SQLiteException ignored) {
+            // Compat users upgrade from Lawnchair 13, see https://github.com/LawnchairLauncher/lawnchair/issues/3881.
+            removeColumn(db, Favorites.TABLE_NAME, "iconPackage");
+            removeColumn(db, Favorites.TABLE_NAME, "iconResource");
+        }
     }
 
     /**