Merge "Clean up properly if outcall for doRestoreFinished() fails" into mnc-dev