am a2fd3234: am 3bfe4b47: am 1cd5afc1: am 9317d0b9: am 1fddd3ef: Merge "Mark isInUse per-window" into mnc-dev

* commit 'a2fd32348b06b22963fcc7c33179fddbd2394dbf':
  Mark isInUse per-window