In order to manipulate the (global) X error handler without races, we
need to lock the X11 display, and also push an XSync through between
locking and changing the error handler, so we don't catch unrelated
errors.

Change-Id: Ic970224c98c05c6e13aadd781f8275cde5f37dd0