Merge "Fixed IndexOutOfBoundsException when removing child windows" into nyc-dev