Merge "Improve stack selection logic during adjacent launch" into nyc-dev