Merge "Return invalid task id if no acceptable target app" into sc-dev