Merge "Fix crash when deleting task" into oc-dev am: c6fa8ee018
am: b2a93b69a2

Change-Id: Ic50927eed7d9f2a0a1a8e4c70118e3fbe633e081