diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5904282dd97..db2d3b24d12 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1707,14 +1707,14 @@
                        android:value="@string/menu_key_apps"/>
         </activity-alias>
 
-        <activity-alias android:name="com.google.android.settings.ManageFullScreenIntent"
+        <activity-alias android:name="ManageFullScreenIntent"
                         android:exported="true"
                         android:targetActivity=".spa.SpaBridgeActivity">
             <meta-data android:name="com.android.settings.spa.DESTINATION"
                        android:value="TogglePermissionAppList/UseFullScreenIntent"/>
         </activity-alias>
 
-        <activity-alias android:name="com.google.android.settings.AppManageFullScreenIntent"
+        <activity-alias android:name="AppManageFullScreenIntent"
                         android:exported="true"
                         android:targetActivity=".spa.SpaAppBridgeActivity">
             <intent-filter>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1b33bb27aa3..5826e601b67 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -7890,7 +7890,7 @@
     <string name="notification_conversation_summary_low">No sound or vibration and appears lower in conversation section</string>
 
     <!-- [CHAR LIMIT=150] Notification Importance title: normal importance level summary -->
-    <string name="notification_channel_summary_default">May ring or vibrate based on phone settings</string>
+    <string name="notification_channel_summary_default">May ring or vibrate based on device settings</string>
 
     <!-- [CHAR LIMIT=150] Notification Importance title: high importance level summary -->
     <string name="notification_channel_summary_high">When device is unlocked, show notifications as a banner across the top of the screen</string>
diff --git a/src/com/android/settings/localepicker/AppLocalePickerActivity.java b/src/com/android/settings/localepicker/AppLocalePickerActivity.java
index 9efaf63c687..092207bdcf5 100644
--- a/src/com/android/settings/localepicker/AppLocalePickerActivity.java
+++ b/src/com/android/settings/localepicker/AppLocalePickerActivity.java
@@ -29,6 +29,8 @@ import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.ListView;
 
+import androidx.core.view.ViewCompat;
+
 import com.android.internal.app.LocalePickerWithRegion;
 import com.android.internal.app.LocaleStore;
 import com.android.settings.R;
@@ -105,12 +107,16 @@ public class AppLocalePickerActivity extends SettingsBaseActivity
     @Override
     public boolean onMenuItemActionCollapse(MenuItem item) {
         mAppBarLayout.setExpanded(false /*expanded*/, false /*animate*/);
+        ViewCompat.setNestedScrollingEnabled(mAppLocaleDetails.getListView(), true);
+        ViewCompat.setNestedScrollingEnabled(mLocalePickerWithRegion.getListView(), true);
         return true;
     }
 
     @Override
     public boolean onMenuItemActionExpand(MenuItem item) {
         mAppBarLayout.setExpanded(false /*expanded*/, false /*animate*/);
+        ViewCompat.setNestedScrollingEnabled(mAppLocaleDetails.getListView(), false);
+        ViewCompat.setNestedScrollingEnabled(mLocalePickerWithRegion.getListView(), false);
         return true;
     }
 
@@ -171,4 +177,4 @@ public class AppLocalePickerActivity extends SettingsBaseActivity
 
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/src/com/android/settings/network/MobileNetworkRepository.java b/src/com/android/settings/network/MobileNetworkRepository.java
index f6096982f0c..7d88821d81f 100644
--- a/src/com/android/settings/network/MobileNetworkRepository.java
+++ b/src/com/android/settings/network/MobileNetworkRepository.java
@@ -433,7 +433,6 @@ public class MobileNetworkRepository extends SubscriptionManager.OnSubscriptions
         mActiveSubInfoEntityList = availableSubInfoEntityList.stream()
                 .filter(SubscriptionInfoEntity::isActiveSubscription)
                 .filter(SubscriptionInfoEntity::isSubscriptionVisible)
-                .sorted((e1, e2) -> Integer.compare(e1.simSlotIndex, e2.simSlotIndex))
                 .collect(Collectors.toList());
         if (DEBUG) {
             Log.d(TAG, "onActiveSubInfoChanged, activeSubInfoEntityList = "
diff --git a/src/com/android/settings/network/MobileNetworkSummaryController.java b/src/com/android/settings/network/MobileNetworkSummaryController.java
index 1474836d7f1..f924636463d 100644
--- a/src/com/android/settings/network/MobileNetworkSummaryController.java
+++ b/src/com/android/settings/network/MobileNetworkSummaryController.java
@@ -134,7 +134,6 @@ public class MobileNetworkSummaryController extends AbstractPreferenceController
             return mContext.getString(R.string.mobile_network_tap_to_activate, displayName);
         } else {
             return mSubInfoEntityList.stream()
-                    .sorted((e1, e2) -> Integer.compare(e1.simSlotIndex, e2.simSlotIndex))
                     .map(SubscriptionInfoEntity::getUniqueDisplayName)
                     .collect(Collectors.joining(", "));
         }
diff --git a/src/com/android/settings/network/telephony/NetworkSelectSettings.java b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
index b26e7835754..ebc3ea6e226 100644
--- a/src/com/android/settings/network/telephony/NetworkSelectSettings.java
+++ b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
@@ -228,10 +228,10 @@ public class NetworkSelectSettings extends DashboardFragment {
 
     @Override
     public void onStop() {
-        super.onStop();
         if (mWaitingForNumberOfScanResults <= 0) {
             stopNetworkQuery();
         }
+        super.onStop();
     }
 
     @Override