Merge "Backup charging sounds enabled toggle correctly"