Merge "Use CopyOnWriteArrayList to avoid ConcurrentModificationException"