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