Add DidSaveScrollOrScaleState flag to prevent restoreScrollPositionAndViewState restore from default

content/renderer/history_serialization.cc

Index: content/renderer/history_serialization.cc
diff --git a/content/renderer/history_serialization.cc b/content/renderer/history_serialization.cc
index b1fae6a778f8af0d9d4bc6a55ac10f4bbd3fd729..ecee4babbd0cf53f6c57f3a671b83019cb861ab4 100644
--- a/content/renderer/history_serialization.cc
+++ b/content/renderer/history_serialization.cc
@@ -54,6 +54,7 @@ void GenerateFrameStateFromItem(const WebHistoryItem& item,
   state->document_sequence_number =
       item.documentSequenceNumber();
   state->page_scale_factor = item.pageScaleFactor();
+  state->did_save_scroll_state = item.didSaveScrollState();
   ToNullableString16Vector(item.getDocumentState(), &state->document_state);
 
   state->http_body.http_content_type =
@@ -102,6 +103,7 @@ void RecursivelyGenerateHistoryItem(const ExplodedFrameState& state,
   item.setVisualViewportScrollOffset(state.visual_viewport_scroll_offset);
   item.setScrollOffset(state.scroll_offset);
   item.setPageScaleFactor(state.page_scale_factor);
+  item.setDidSaveScrollState(state.did_save_scroll_state);
 
   // These values are generated at WebHistoryItem construction time, and we
   // only want to override those new values with old values if the old values