Merge "Use CopyOnWriteArrayList to avoid ConcurrentModificationException." into tm-qpr-dev