Merge "Add child windows to their parent WindowToken"