Backport of "queue2: Fix deadlock when deactivate is called in pull mode" into 1.20
Backport of !2967 (merged) "queue2: Fix deadlock when deactivate is called in pull mode".
Commits:
- ccef2690 queue2: Fix deadlock when deactivate is called in pull mode