diff --git a/res/values/themes_suw.xml b/res/values/themes_suw.xml
index 067ddfb558c..a0585fd9115 100644
--- a/res/values/themes_suw.xml
+++ b/res/values/themes_suw.xml
@@ -208,6 +208,8 @@
         <!-- copied from Theme.DeviceDefault.Dialog.Alert -->
         <item name="colorAccent">@*android:color/accent_device_default_dark</item>
         <item name="dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+
+        <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
     </style>
 
     <style name="SuwAlertDialogThemeCompat.Light" parent="@style/Theme.AppCompat.Light.Dialog.Alert">
@@ -218,6 +220,8 @@
         <!-- copied from Theme.DeviceDefault.Light.Dialog.Alert -->
         <item name="colorAccent">@*android:color/accent_device_default_light</item>
         <item name="dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+
+        <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
     </style>
 
     <!-- This theme was applied to Settings pages which are running under SUW. -->
diff --git a/src/com/android/settings/biometrics/face/FaceEnrollEducation.java b/src/com/android/settings/biometrics/face/FaceEnrollEducation.java
index 08cf5ff12f7..fa8f5564f2e 100644
--- a/src/com/android/settings/biometrics/face/FaceEnrollEducation.java
+++ b/src/com/android/settings/biometrics/face/FaceEnrollEducation.java
@@ -226,7 +226,10 @@ public class FaceEnrollEducation extends BiometricEnrollBase {
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         mResultIntent = data;
-        if (requestCode == BIOMETRIC_FIND_SENSOR_REQUEST
+        if (resultCode == RESULT_TIMEOUT) {
+            setResult(resultCode, data);
+            finish();
+        } else if (requestCode == BIOMETRIC_FIND_SENSOR_REQUEST
                 || requestCode == ENROLL_NEXT_BIOMETRIC_REQUEST) {
             // If the user finished or skipped enrollment, finish this activity
             if (resultCode == RESULT_SKIP || resultCode == RESULT_FINISHED
@@ -234,9 +237,6 @@ public class FaceEnrollEducation extends BiometricEnrollBase {
                 setResult(resultCode, data);
                 finish();
             }
-        } else if (resultCode == RESULT_TIMEOUT) {
-            setResult(resultCode, data);
-            finish();
         }
     }
 
diff --git a/src/com/android/settings/emergency/MoreSettingsPreferenceController.java b/src/com/android/settings/emergency/MoreSettingsPreferenceController.java
index cbb95a6357b..d945b2134e4 100644
--- a/src/com/android/settings/emergency/MoreSettingsPreferenceController.java
+++ b/src/com/android/settings/emergency/MoreSettingsPreferenceController.java
@@ -115,7 +115,7 @@ public class MoreSettingsPreferenceController extends BasePreferenceController i
                 .logClickedPreference(mPreference, getMetricsCategory());
         final Intent intent = new Intent(mIntent)
                 .addCategory(Intent.CATEGORY_LAUNCHER)
-                .setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+                .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
         Bundle bundle = new Bundle();
         bundle.putString(EXTRA_KEY_ATTRIBUTION, mContext.getPackageName());
         mContext.startActivity(intent, bundle);
diff --git a/src/com/android/settings/network/telephony/MobileNetworkActivity.java b/src/com/android/settings/network/telephony/MobileNetworkActivity.java
index b122cdc04b1..c6fe39c2a2b 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkActivity.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkActivity.java
@@ -257,6 +257,7 @@ public class MobileNetworkActivity extends SettingsBaseActivity
         if (currentSubInfo == null) {
             currentSubInfo = subList.stream()
                     .filter(SubscriptionAnnotation::isDisplayAllowed)
+                    .filter(SubscriptionAnnotation::isActive)
                     .findFirst().orElse(null);
         }
         return (currentSubInfo == null) ? null : currentSubInfo.getSubInfo();