Merge "Revert "Get rid of charging sounds toggle"" into pi-dev