Merge "Adjust the volumeDialog layout" into pi-dev