Merge "Remove unused callback consumer in TaskOrganizerController" into main