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

Change-Id: Ifa54d483f383183ca4fd0864e514d399022db632