d68da0b8cf
In order to correctly fix the issue to make sure we only set the focused surface to NULL during a grab, but not the current surface, we need to merge update_current_surface back into repick_for_event so we have more control over the behavior here.