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