Merge "Revert "Edit dnd icon in volume dialog"" into pi-dev
am: 630f58ea04

Change-Id: I21798a70399579f32f2a34453e585b4f0758cf01