am f1058308: Merge "Add window to child window list with correct order"

* commit 'f1058308c62f297c5bca9e9baf8451efeb200805':
  Add window to child window list with correct order