Merge change 22544 into eclair

* changes:
  Fix bug that would leave old windows around.