Merge "Missing UpdateState::Cancelled string conversions"