Merge "Don't include removed window when counting interesting windows" into nyc-dev