Merge "DndTile includes secondary label in content descr." into pi-dev