Merge "Fix drag and drop behavior"