Merge "Always show or hide volume dialog" into pi-dev