Merge "Prevents NPE from double remove in TestTaskOrganizer" into rvc-dev