Merge "Dump window state when test fails" into main