Merge "Fix issue with persistent drag window"