Merge "Fix tests with TaskFragmentOrganizer" into main