Merge "[wm] Use existing parent window token for child windows"