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

Change-Id: I58e63317a1c842e49a072507565c546789bb01ad