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

Change-Id: Ie4698f1ceacf92eb4551ee0ca27b25696e6f1b6d