am 5b6912e4: Merge "Decrement suspend count if thread is shutting down"

* commit '5b6912e455da798a79a4bb3235e276351b38ab58':
  Decrement suspend count if thread is shutting down