Merge "slim_ngd: Handle error flags before handling SENT flag"