remote: Move discard_pending_stop_replies call