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

Change-Id: I2b490ce6c47bc48c6ca116fcb221d5c55cd53225