Revert "Revert "workqueue: Backport from upstream""

This reverts commit 5b7eb7b153eb51a3ae41a5713d0d8b99b35d0e1b.