MD Settings: Ensure all search results are visible when going back.

chrome/browser/resources/settings/settings_main/settings_main.html

Index: chrome/browser/resources/settings/settings_main/settings_main.html
diff --git a/chrome/browser/resources/settings/settings_main/settings_main.html b/chrome/browser/resources/settings/settings_main/settings_main.html
index 079e394fde105063f078ecd55252f99d56abd45c..5990eceac019f28e93e72257b2608d59113fd847 100644
--- a/chrome/browser/resources/settings/settings_main/settings_main.html
+++ b/chrome/browser/resources/settings/settings_main/settings_main.html
@@ -61,7 +61,8 @@
       <div>$i18n{searchNoResults}</div>
       <div>$i18nRaw{searchNoResultsHelp}</div>
     </div>
-    <template is="dom-if" if="[[showPages_.basic]]">
+    <template is="dom-if" if="[[showBasicPage_(
+        showPages_.basic, inSearchMode_, hasExpandedSection_)]]">
       <settings-basic-page route="BASIC" prefs="{{prefs}}"
           page-visibility="[[pageVisibility]]"
           on-subpage-expand="onSubpageExpand_">
@@ -80,7 +81,8 @@
           </paper-button>
         </div>
       </template>
-      <template is="dom-if" if="[[showPages_.advanced]]">
+      <template is="dom-if" if="[[showAdvancedPage_(
+          showPages_.advanced, inSearchMode_, hasExpandedSection_)]]">
         <settings-advanced-page route="ADVANCED" prefs="{{prefs}}"
             page-visibility="[[pageVisibility]]"
             on-subpage-expand="onSubpageExpand_">