Merge "Update volume logging" into pi-dev