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

* commit '9317d0b9904573bdb0d815ec563dd263447f11db':
  Mark isInUse per-window