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