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

Change-Id: Ia336b014df6e9a9445d17f9aa485d24b3f1ea921