Merge "Backup and restore ringtone and notification ringtone" into klp-dev