Merge "Introduce a flag removeWithTaskOrganizer." into sc-dev