Merge "Make sure DragDownHelper is told of CANCEL touch event" into main