Fixed an endpoint delete issue with a possible stale sbox Upstream-commit: da969aac5ab0b1376615ed54fb54a909c98f05f8 Component: engine