Merge "Return the activity type of any child activity in the Task" into tm-dev