Merge "Add null check to AbstractStateChangeTouchController#onDragEnd()"