Merge "Update default charging sound to new sound" into pi-dev