Merge "Set `mStatus` when `dispatchNextRestore` encounters a transport error" into main