Fix event dispatcher of surface and layer