Merge "Preserve windows during stack resize."