Merge "Include child windows when looking for insertion point." into jb-mr1.1-dev