Prevent stale windows from wedging app previews (#4213)