Merge "Bring task to front when we can't move to adjacent stack" into nyc-dev