Merge "Edit dnd icon in volume dialog" into pi-dev am: 57e77be49d
am: 278b8a9dd7

Change-Id: I220c2c191168452d83a65fe031d95f848e297ebe