Merge "Restrict showing "new ringtone" for missing picker"