(Issue 3572) Make badge part of core list options component