Merge "Add error handling for start task and intent" into tm-dev