Merge "Check for source activity's task presence before referencing." into oc-dev