Merge "Fix memory leak of Dnd tile"
am: 6057a8360a

Change-Id: Iabe8449a6703104d4dc14f67bad411fad7236e62