Merge "DndTile: Avoid yet another NPE during boot up phase"
am: 2446a10799

Change-Id: I211f94c3dedc4f288d436ba3aff7f52309a994d3