Merge "Update top resumed activity and focused app while adding a task on top" into tm-qpr-dev