Merge "When restacking IM windows preserve relative order." into nyc-dev