Bug fix: Refer removed surface id in vector of pending_end_draw