Merge "DndTile: Avoid NPE during boot phase"
am: e134d23a7a

Change-Id: Iff3b41e08abc89956b924b40b6d72bf79a294eb0