[2.2] TODO fixes

This PR resolves all the remaining TODO 2.2 comments.
Doesn't this remain a potential infinite loop if there's some bug during shutdown?