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

Change-Id: I24749f6c1b61058b1053b280afae751ed0a23877