Wait for an event before actually realizing it

This would wrongly emit a 'timeout' log entry when switching
between two instances of the same language.

Change-Id: I56e5de121b87f3e762b58f0b2a77e9abc784036e