Make local message dispatching synchronous

Change-Id: Iec8bc619ad75d402d8bb79bf2326a54d75018d3f