Merge "Reset mActiveController to null in DragLayer.onInterceptTouchEvent()." into ub-launcher3-calgary

src/com/android/launcher3/dragndrop/DragLayer.java

@@ -295,6 +295,8 @@ public class DragLayer extends InsettableFrameLayout {
         }
         clearAllResizeFrames();
 
+        mActiveController = null;
+
         if (mDragController.onInterceptTouchEvent(ev)) {
             mActiveController = mDragController;
             return true;