Merge "Make the dump of the window hierarchy more readable"