Merge "Removing check preventing pinned stack tasks from matching by affinity." into oc-dev