Add `REMOVE` and `ORPHANED` to TaskState Upstream-commit: 3a6f8cfd5108aa3fac145525b7cd2f4f0439702d Component: engine