Merge "Fixed some issues with tasks with the same affinity in different stacks"