Merge "Refactor TaskStackContainers#assignStackOrdering()"