Merge "Add new extras and categories to the RingtoneManager class." into main