Merge "Fix potential NPE when removing TaskOrganizerController" into rvc-dev am: b556cb72 am: da89ceb5 Change-Id: I6591349b31e0b0577a2a4b0e61af7089a68ace71