Fix ConcurrentModificationException caused by synchronous local message dispatching

Change-Id: I3312a5d5e4ce73ac49d45ea4b9c74ec55a76abd0