Merge "Fix ConcurrentModificationException in WindowContext" into main