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