Backed out changeset b94afd94ed9c (bug 1924861) for causing multiple bc failures. CLOSED TREE

docshell/base/CanonicalBrowsingContext.cpp

@@ -1223,6 +1223,14 @@ void CanonicalBrowsingContext::SetActiveSessionHistoryEntry(
     mActiveEntry->SharedInfo()->mCacheKey = aUpdatedCacheKey;
   }
 
+  if (oldActiveEntry) {
+    // aInfo comes from the entry stored in the current document's docshell,
+    // whose interaction state does not get updated. So we instead propagate
+    // state from the previous canonical entry. See bug 1917369.
+    mActiveEntry->SetHasUserInteraction(
+        oldActiveEntry->GetHasUserInteraction());
+  }
+
   if (IsTop()) {
     Maybe<int32_t> previousEntryIndex, loadedEntryIndex;
     shistory->AddToRootSessionHistory(