am 1da25f93: am 50884b5b: am f1058308: Merge "Add window to child window list with correct order"

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