Merge "Don\'t include removed window when counting interesting windows" into nyc-dev am: 18ef543102
am: 9eef46b66f

* commit '9eef46b66f0265ce7d851216c6662fcbbca8783a':
  Don't include removed window when counting interesting windows

Change-Id: Ie8b8dec30cd6aa9e51d1e11d4b80293bc27340e6