Merge "Fix the drag window still alive after drop failed" into sc-dev