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

Change-Id: I65e242e2f3de857c508c9a7c768ef504121acb25