Merge "Fix memory leak of Dnd tile"