Merge "Format WindowInfo dump" into main