Merge "Re-adding the task to recents once task affinity updated" into tm-dev