Merge "Do not use stale relayout window infos" into main