Merge "Add unit test for TaskFragmentOrganizer" into sc-v2-dev