Merge "Replace ArrayList with a CopyOnWriteArrayList"