Merge "Find activity in task with same user" into tm-qpr-dev