Merge "Revert "All users will hear charging sounds."" into pi-dev