Merge "Changed two strings from using "ringtone" to "sound""