Also log we're shutting down properly
(cherry picked from commit a7b5b3e83d7124b1d3bac650df20272368e476f5)