diff --git a/res/xml/app_info_settings.xml b/res/xml/app_info_settings.xml
index f5d927ef26e..fef52432d24 100644
--- a/res/xml/app_info_settings.xml
+++ b/res/xml/app_info_settings.xml
@@ -18,33 +18,33 @@
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res-auto"
-    android:key="installed_app_detail_settings_screen"
-    settings:initialExpandedChildrenCount="6">
+    android:key="installed_app_detail_settings_screen">
 
     <com.android.settingslib.widget.LayoutPreference
         android:key="header_view"
         android:layout="@layout/settings_entity_header"
         android:selectable="false"
-        android:order="-10000"
-        settings:allowDividerBelow="true"/>
+        android:order="-10000" />
 
     <com.android.settingslib.widget.LayoutPreference
         android:key="instant_app_buttons"
         android:layout="@layout/instant_app_buttons"
         android:selectable="false"
-        android:order="-9999"
-        settings:allowDividerAbove="true"
-        settings:allowDividerBelow="true"/>
+        android:order="-9999" />
 
     <com.android.settingslib.widget.ActionButtonsPreference
         android:key="action_buttons"
         android:order="-9998" />
 
+    <Preference
+        android:key="app_settings_link"
+        android:title="@string/app_settings_link"
+        settings:controller="com.android.settings.applications.appinfo.AppSettingPreferenceController" />
+
     <Preference
         android:key="notification_settings"
         android:title="@string/notifications_label"
-        settings:controller="com.android.settings.applications.appinfo.AppNotificationPreferenceController"
-        settings:allowDividerAbove="true"/>
+        settings:controller="com.android.settings.applications.appinfo.AppNotificationPreferenceController" />
 
     <com.android.settings.widget.FixedLineSummaryPreference
         android:key="permission_settings"
@@ -71,6 +71,12 @@
         android:summary="@string/summary_placeholder"
         settings:controller="com.android.settings.applications.appinfo.AppDataUsagePreferenceController" />
 
+    <Preference
+        android:key="extra_app_info_settings"
+        android:title="@string/extra_app_info_label"
+        android:summary="@string/extra_app_info_summary"
+        settings:controller="com.android.settings.applications.appinfo.ExtraAppInfoPreferenceController" />
+
     <Preference
         android:key="time_spent_in_app"
         android:title="@string/time_spent_in_app_pref_title"
@@ -184,12 +190,6 @@
 
     </PreferenceCategory>
 
-    <Preference
-        android:key="app_settings_link"
-        android:title="@string/app_settings_link"
-        settings:controller="com.android.settings.applications.appinfo.AppSettingPreferenceController"
-        settings:allowDividerAbove="true" />
-
     <Preference
         android:key="app_version"
         android:selectable="false"
diff --git a/res/xml/app_info_settings_v2.xml b/res/xml/app_info_settings_v2.xml
deleted file mode 100644
index b4a82e0a3f3..00000000000
--- a/res/xml/app_info_settings_v2.xml
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2021 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res-auto"
-    android:key="installed_app_detail_settings_screen">
-
-    <com.android.settingslib.widget.LayoutPreference
-        android:key="header_view"
-        android:layout="@layout/settings_entity_header"
-        android:selectable="false"
-        android:order="-10000" />
-
-    <com.android.settingslib.widget.LayoutPreference
-        android:key="instant_app_buttons"
-        android:layout="@layout/instant_app_buttons"
-        android:selectable="false"
-        android:order="-9999" />
-
-    <com.android.settingslib.widget.ActionButtonsPreference
-        android:key="action_buttons"
-        android:order="-9998" />
-
-    <Preference
-        android:key="app_settings_link"
-        android:title="@string/app_settings_link"
-        settings:controller="com.android.settings.applications.appinfo.AppSettingPreferenceController" />
-
-    <Preference
-        android:key="notification_settings"
-        android:title="@string/notifications_label"
-        settings:controller="com.android.settings.applications.appinfo.AppNotificationPreferenceController" />
-
-    <com.android.settings.widget.FixedLineSummaryPreference
-        android:key="permission_settings"
-        android:title="@string/permissions_label"
-        android:summary="@string/summary_placeholder"
-        settings:summaryLineCount="1"
-        settings:controller="com.android.settings.applications.appinfo.AppPermissionPreferenceController" />
-
-    <Preference
-        android:key="storage_settings"
-        android:title="@string/storage_settings_for_app"
-        android:summary="@string/summary_placeholder"
-        settings:controller="com.android.settings.applications.appinfo.AppStoragePreferenceController" />
-
-    <com.android.settings.applications.AppDomainsPreference
-        android:key="instant_app_launch_supported_domain_urls"
-        android:title="@string/app_launch_supported_domain_urls_title"
-        android:selectable="true"
-        settings:controller="com.android.settings.applications.appinfo.InstantAppDomainsPreferenceController" />
-
-    <Preference
-        android:key="data_settings"
-        android:title="@string/data_usage_app_summary_title"
-        android:summary="@string/summary_placeholder"
-        settings:controller="com.android.settings.applications.appinfo.AppDataUsagePreferenceController" />
-
-    <Preference
-        android:key="extra_app_info_settings"
-        android:title="@string/extra_app_info_label"
-        android:summary="@string/extra_app_info_summary"
-        settings:controller="com.android.settings.applications.appinfo.ExtraAppInfoPreferenceController" />
-
-    <Preference
-        android:key="time_spent_in_app"
-        android:title="@string/time_spent_in_app_pref_title"
-        settings:controller="com.android.settings.applications.appinfo.TimeSpentInAppPreferenceController" />
-
-    <Preference
-        android:key="battery"
-        android:title="@string/power_usage_summary_title"
-        android:summary="@string/summary_placeholder" />
-
-    <Preference
-        android:key="preferred_settings"
-        android:title="@string/launch_by_default"
-        android:summary="@string/summary_placeholder"
-        android:selectable="true"
-        settings:controller="com.android.settings.applications.appinfo.AppOpenByDefaultPreferenceController" />
-
-    <Preference
-        android:key="memory"
-        android:title="@string/memory_settings_title"
-        android:summary="@string/summary_placeholder"
-        android:enabled="false" />
-
-    <!-- Default apps shortcuts -->
-    <Preference
-        android:key="default_home"
-        android:title="@string/home_app"
-        android:summary="@string/summary_placeholder" />
-
-    <Preference
-        android:key="default_browser"
-        android:title="@string/default_browser_title"
-        android:summary="@string/summary_placeholder" />
-
-    <Preference
-        android:key="default_phone_app"
-        android:title="@string/default_phone_title"
-        android:summary="@string/default_phone_title" />
-
-    <Preference
-        android:key="default_emergency_app"
-        android:title="@string/default_emergency_app"
-        android:summary="@string/summary_placeholder" />
-
-    <Preference
-        android:key="default_sms_app"
-        android:title="@string/sms_application_title"
-        android:summary="@string/summary_placeholder" />
-
-    <PreferenceCategory
-        android:key="app_hibernation_info"
-        android:title="@string/unused_apps"
-        settings:controller=
-            "com.android.settings.applications.appinfo.AppHibernationPreferenceCategoryController">
-
-        <SwitchPreference
-            android:key="hibernation_switch"
-            android:title="@string/unused_apps_switch"
-            settings:controller=
-                "com.android.settings.applications.appinfo.HibernationSwitchPreferenceController" />
-    </PreferenceCategory>
-
-    <!-- Advanced apps settings -->
-    <PreferenceCategory
-        android:key="advanced_app_info"
-        android:title="@string/advanced_apps"
-        settings:controller="com.android.settings.applications.appinfo.AdvancedAppInfoPreferenceCategoryController">
-
-        <Preference
-            android:key="system_alert_window"
-            android:title="@string/draw_overlay"
-            android:summary="@string/summary_placeholder"
-            settings:controller="com.android.settings.applications.appinfo.DrawOverlayDetailPreferenceController" />
-
-        <Preference
-            android:key="write_settings_apps"
-            android:title="@string/write_settings"
-            android:summary="@string/summary_placeholder"
-            settings:controller="com.android.settings.applications.appinfo.WriteSystemSettingsPreferenceController" />
-
-        <Preference
-            android:key="picture_in_picture"
-            android:title="@string/picture_in_picture_app_detail_title"
-            android:summary="@string/summary_placeholder"
-            settings:controller="com.android.settings.applications.specialaccess.pictureinpicture.PictureInPictureDetailPreferenceController" />
-
-        <Preference
-            android:key="install_other_apps"
-            android:title="@string/install_other_apps"
-            android:summary="@string/summary_placeholder"
-            settings:controller="com.android.settings.applications.appinfo.ExternalSourceDetailPreferenceController" />
-
-        <Preference
-            android:key="interact_across_profiles"
-            android:title="@string/interact_across_profiles_title"
-            android:summary="@string/summary_placeholder"
-            settings:controller="com.android.settings.applications.specialaccess.interactacrossprofiles.InteractAcrossProfilesDetailsPreferenceController" />
-
-    </PreferenceCategory>
-
-    <!-- App installer info -->
-    <PreferenceCategory
-        android:key="app_installer"
-        android:title="@string/app_install_details_group_title"
-        settings:controller="com.android.settings.applications.appinfo.AppInstallerPreferenceCategoryController">
-
-        <Preference
-            android:key="app_info_store"
-            android:title="@string/app_install_details_title"
-            settings:controller="com.android.settings.applications.appinfo.AppInstallerInfoPreferenceController" />
-
-    </PreferenceCategory>
-
-    <Preference
-        android:key="app_version"
-        android:selectable="false"
-        android:order="9999"
-        settings:controller="com.android.settings.applications.appinfo.AppVersionPreferenceController"
-        settings:allowDividerAbove="true"
-        settings:enableCopying="true"/>
-
-</PreferenceScreen>
diff --git a/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java b/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java
index 6a5c5df30f6..a6ed4b82f8a 100755
--- a/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java
+++ b/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java
@@ -35,7 +35,6 @@ import android.os.Bundle;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.text.TextUtils;
-import android.util.FeatureFlagUtils;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -49,7 +48,6 @@ import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.applications.manageapplications.ManageApplications;
 import com.android.settings.applications.specialaccess.interactacrossprofiles.InteractAcrossProfilesDetailsPreferenceController;
 import com.android.settings.applications.specialaccess.pictureinpicture.PictureInPictureDetailPreferenceController;
-import com.android.settings.core.FeatureFlags;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settingslib.RestrictedLockUtilsInternal;
@@ -166,9 +164,7 @@ public class AppInfoDashboardFragment extends DashboardFragment
         use(AppStoragePreferenceController.class).setParentFragment(this);
         use(AppVersionPreferenceController.class).setParentFragment(this);
         use(InstantAppDomainsPreferenceController.class).setParentFragment(this);
-        if (FeatureFlagUtils.isEnabled(context, FeatureFlags.SILKY_HOME)) {
-            use(ExtraAppInfoPreferenceController.class).setPackageName(packageName);
-        }
+        use(ExtraAppInfoPreferenceController.class).setPackageName(packageName);
 
         final HibernationSwitchPreferenceController appHibernationSettings =
                 use(HibernationSwitchPreferenceController.class);
@@ -258,9 +254,6 @@ public class AppInfoDashboardFragment extends DashboardFragment
 
     @Override
     protected int getPreferenceScreenResId() {
-        if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.SILKY_HOME)) {
-            return R.xml.app_info_settings_v2;
-        }
         return R.xml.app_info_settings;
     }