Merge "Fix ConcurrentModificationException in SyncManager" into nyc-dev