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