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