Ensure trash context is reset

Alex Pottrequested to merge
issue/entity_usage-3612533:3612533-trash-context-8.x-2.x into 8.x-2.x

Closes #3612533

Merge request reports