More cleanups

Author: javiercn

src/Components/Components/src/PersistentComponentState.cs

@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
 using static Microsoft.AspNetCore.Internal.LinkerFlags;
@@ -81,7 +82,8 @@ public PersistingComponentStateSubscription RegisterOnPersisting(Func<Task> call
     /// <returns>A subscription that can be used to unregister the callback when disposed.</returns>
     public RestoringComponentStateSubscription RegisterOnRestoring(Action callback, RestoreOptions options)
     {
-        if (_currentContext!.ShouldRestore(options))
+        Debug.Assert(_currentContext != null);
+        if (_currentContext.ShouldRestore(options))
         {
             callback();
         }

src/Components/Components/src/PersistentState/ComponentStatePersistenceManager.cs

@@ -82,14 +82,13 @@ public async Task RestoreStateAsync(IPersistentComponentStateStore store, Restor
             _stateIsInitialized = true;
         }
 
-        foreach (var registration in _registeredRestoringCallbacks)
+        if (context == RestoreContext.ValueUpdate)
         {
-            //if (scenario == null || registration.Filter == null ||
-            //    (registration.Filter.SupportsScenario(scenario) && registration.Filter.ShouldRestore(scenario)) ||
-            //    (!registration.Filter.SupportsScenario(scenario) && !scenario.IsRecurring))
-            //{
-            registration.Callback();
-            //}
+            foreach (var registration in _registeredRestoringCallbacks)
+            {
+                registration.Callback();
+            }
+            return;
         }
     }