Make sure WaitForEndOfFrame object is never null

Author: sinai-dev

src/Core/Input/CursorUnlocker.cs

@@ -62,13 +62,13 @@ public static void SetupAggressiveUnlock()
             }
         }
 
-        private static readonly WaitForEndOfFrame _waitForEndOfFrame = new WaitForEndOfFrame();
+        private static WaitForEndOfFrame _waitForEndOfFrame = new WaitForEndOfFrame();
 
         private static IEnumerator AggressiveUnlockCoroutine()
         {
             while (true)
             {
-                yield return _waitForEndOfFrame;
+                yield return _waitForEndOfFrame ?? (_waitForEndOfFrame = new WaitForEndOfFrame());
 
                 if (UIManager.ShowMenu)
                     UpdateCursorControl();

src/UI/Widgets/ScrollPool/ScrollPool.cs

@@ -193,13 +193,12 @@ public void Initialize(ICellPoolDataSource<T> dataSource, Action onHeightChanged
             RuntimeProvider.Instance.StartCoroutine(InitCoroutine(onHeightChangedListener));
         }
 
-        private readonly WaitForEndOfFrame waitForEndOfFrame = new WaitForEndOfFrame();
+        private WaitForEndOfFrame waitForEndOfFrame = new WaitForEndOfFrame();
 
         private IEnumerator InitCoroutine(Action onHeightChangedListener)
         {
             ScrollRect.content.anchoredPosition = Vector2.zero;
-            //yield return null;
-            yield return waitForEndOfFrame;
+            yield return waitForEndOfFrame ?? (waitForEndOfFrame = new WaitForEndOfFrame());
 
             LayoutRebuilder.ForceRebuildLayoutImmediate(Content);