Merge "Use correct filename when adding to ringtone"