Merge "WinScope: Properly show child windows."