Merge "add config option for safe volume warning" into pi-dev