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

Change-Id: Icb2d14ee8f7d5646e248aa010bcf731b6f1ff60f