am 2a09e92a: Merge "Make SetStateUnsafe run checkpoints before going to suspended"

* commit '2a09e92a87ff788479ba481b3b216609424aabdc':
  Make SetStateUnsafe run checkpoints before going to suspended