Merge "drag-and-drop : Add leave event when dragging is cancelled" into devel/master