Merge "Fix ConcurrentModificationException on WindowToken" into main