diff --git a/libs/window_ext_lib.aar b/libs/window_ext_lib.aar
index cb1f242672e..301ff9672ae 100644
Binary files a/libs/window_ext_lib.aar and b/libs/window_ext_lib.aar differ
diff --git a/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java b/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java
index a0f4aad4153..3967bd765c0 100644
--- a/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java
+++ b/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java
@@ -47,7 +47,7 @@ public class ActivityEmbeddingRulesController {
 
     public ActivityEmbeddingRulesController(Context context) {
         mContext = context;
-        mSplitController = new SplitController(context);
+        mSplitController = SplitController.getInstance();
     }
 
     /**
@@ -77,10 +77,9 @@ public class ActivityEmbeddingRulesController {
             boolean finishPrimaryWithSecondary, boolean finishSecondaryWithPrimary) {
         final Set<SplitPairFilter> filters = new HashSet<>();
         filters.add(new SplitPairFilter(primary, secondary,
-                null /* secondaryActivityIntentAction */,
-                null /* secondaryActivityIntentCategory */));
+                null /* secondaryActivityIntentAction */));
 
-        new SplitController(context).registerRule(new SplitPairRule(filters,
+        SplitController.getInstance().registerRule(new SplitPairRule(filters,
                 finishPrimaryWithSecondary,
                 finishSecondaryWithPrimary, true /* clearTop */,
                 ActivityEmbeddingUtils.getMinCurrentScreenSplitWidthPx(context),
@@ -91,10 +90,12 @@ public class ActivityEmbeddingRulesController {
 
     private void registerHomepagePlaceholderRule() {
         final Set<ActivityFilter> activityFilters = new HashSet<>();
-        activityFilters.add(new ActivityFilter(getComponentName(SettingsHomepageActivity.class)));
-        activityFilters.add(new ActivityFilter(getComponentName(Settings.class)));
+        activityFilters.add(new ActivityFilter(getComponentName(SettingsHomepageActivity.class),
+                null /* intentAction */));
+        activityFilters.add(new ActivityFilter(getComponentName(Settings.class),
+                null /* intentAction */));
         activityFilters.add(new ActivityFilter(new ComponentName(Utils.SETTINGS_PACKAGE_NAME,
-                SettingsHomepageActivity.ALIAS_DEEP_LINK)));
+                SettingsHomepageActivity.ALIAS_DEEP_LINK), null /* intentAction */));
         final Intent intent = new Intent();
         intent.setComponent(getComponentName(Settings.NetworkDashboardActivity.class));
         final SplitPlaceholderRule placeholderRule = new SplitPlaceholderRule(
diff --git a/src/com/android/settings/activityembedding/ActivityEmbeddingUtils.java b/src/com/android/settings/activityembedding/ActivityEmbeddingUtils.java
index fd6618716e0..ab999ed8888 100644
--- a/src/com/android/settings/activityembedding/ActivityEmbeddingUtils.java
+++ b/src/com/android/settings/activityembedding/ActivityEmbeddingUtils.java
@@ -55,7 +55,7 @@ public class ActivityEmbeddingUtils {
     public static boolean isEmbeddingActivityEnabled(Context context) {
         final boolean isFlagEnabled = FeatureFlagUtils.isEnabled(context,
                 FeatureFlagUtils.SETTINGS_SUPPORT_LARGE_SCREEN);
-        final boolean isSplitSupported = new SplitController(context).isSplitSupported();
+        final boolean isSplitSupported = SplitController.getInstance().isSplitSupported();
 
         Log.d(TAG, "isFlagEnabled = " + isFlagEnabled);
         Log.d(TAG, "isSplitSupported = " + isSplitSupported);