Merge "Fix typo in Window.java doc comments" into main