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

Change-Id: I75aed0fd10eb95d06f89c48cdda7fd1658a3ad2c