Store original state when suspending

We were losing the original state when suspending a rescued instance. This
patch ensures that a suspended rescued instance is restored to the rescued
state on resume.

Closes-Bug: #1342055
Change-Id: I89be60d65eddcfe561794c210b1057fdb157cf41
Merge "Store original state when suspending"