Merge "Don\'t throw RemoteException from new NLS APIs" into nyc-dev am: 28d9ef8112
am: 9ab291e20e

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

Change-Id: I4a45f4068b6ad5328d34ede02fd5bc078dff27d7