Merge "Add a setting for the volume hush gesture" into pi-dev