Merge "Decrement suspend count if thread is shutting down"