Merge "add config option for safe volume warning" into pi-dev am: 5cd354c89c
am: 3033c20d48

Change-Id: Icc1ddaf9cbd18d2326c6487566b71ad7b0c54b9d