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

Change-Id: I12dae89a0b577379e7a868182b535f5dcda09d36