Merge "Don't collect task on activity-start" into tm-qpr-dev