Merge "Adjust vol dnd icon layout width" into pi-dev