Merge "Updating ItemInfo objects in the worker thread" into ub-now-queens

diff --cc src/com/android/launcher3/Launcher.java
index be84540,3762c2f..178f6cb
--- 1/src/com/android/launcher3/Launcher.java
--- 2/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@@ -2063,12 -2032,7 +2064,11 @@@ public class Launcher extends Activit
          mWorkspace = null;
          mDragController = null;
  
-         PackageInstallerCompat.getInstance(this).onStop();
          LauncherAnimUtils.onDestroyActivity();
 +
 +        if (mLauncherCallbacks != null) {
 +            mLauncherCallbacks.onDestroy();
 +        }
      }
  
      public DragController getDragController() {

diff --cc src/com/android/launcher3/LauncherAppState.java
Simple merge

diff --cc src/com/android/launcher3/LauncherModel.java
Simple merge

diff --cc src/com/android/launcher3/Workspace.java
Simple merge