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

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