Merge "Fixing crash in D&D due to race conditions during drag end."