Merge "Adding new ringtones and notifications"