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

* commit '1cd5afc135b0aea3249219fcfb393d9bd9b53ec2':
  Mark isInUse per-window