am 6360758c: Make sure we still handle shutdown-related message even if we\'re

* commit '6360758ce2d171169d2a21e30266547ee4ac0fec':
  Make sure we still handle shutdown-related message even if we're