Merge "WinScope: Properly show child windows."
am: acf69cc766

Change-Id: Ie97ef7ee853d20691b504f3c5b87b1079ec8b2ab