am 285970cf: Merge "Fixed index out of bounds issue when removing windows." into lmp-mr1-dev
automerge: 4937d95

* commit '4937d95aa4f6eecec288f1b4f2d4cfd7f4b48044':
  Fixed index out of bounds issue when removing windows.