Merge "Avoid unnecessary WindowInfo copies" into main