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

Change-Id: I66d6f38d6f53251c0bc58d9ea49b4458d8b000f9