Merge "Change drag from shortcuts to say "Cancel" instead of "Remove"" into ub-launcher3-calgary

src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java

@@ -566,7 +566,7 @@ public class DeepShortcutsContainer extends LinearLayout implements View.OnLongC
 
     @Override
     public boolean supportsDeleteDropTarget() {
-        return true;
+        return false;
     }
 
     @Override