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

* commit '3bfe4b47c7629fab50e64a62d1fa72ab714aa9e0':
  Mark isInUse per-window