Merge "Fix potential NPE when removing TaskOrganizerController" into rvc-dev