Merge "Provide alternative find-task method without ActivityRecord"