Merge "Change to SynchronizedList to fix exception."