Merge "Fix NPE in FloatingIconView" into sc-v2-dev am: 199644c397

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16307843

Change-Id: Id2c8303401239da3a92eaeaa05d9dc47412831d0

src/com/android/launcher3/views/FloatingIconView.java

@@ -460,7 +460,7 @@ public class FloatingIconView extends FrameLayout implements
         if (mIconLoadResult != null && mIconLoadResult.isIconLoaded) {
             setVisibility(View.VISIBLE);
         }
-        if (!mIsOpening) {
+        if (!mIsOpening && mOriginalIcon != null) {
             // When closing an app, we want the item on the workspace to be invisible immediately
             setIconAndDotVisible(mOriginalIcon, false);
         }