Merge "Mark isInUse per-window" into mnc-dev