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

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