Merge "Fix potential NPE when removing TaskOrganizerController" into rvc-dev am: b556cb72 am: 6259ba98 Change-Id: Ic12f9c77f4b65096eae25c7774a890cc826e1580