wayland-surface: Merge actor_surface_commit back in

Since we do it unconditionally now, the code flows better
if it's inline with commit_double_buffered_state.