Merge "Add window flags and window types to hierarchyviewer."