diff --git a/res/values/strings.xml b/res/values/strings.xml
index 454223487a0..ab6c2477ff1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4817,7 +4817,7 @@
     <!-- Title for the accessibility preference category of interaction control services and settings. [CHAR LIMIT=50] -->
     <string name="interaction_control_category_title">Interaction controls</string>
     <!-- Title for the accessibility preference category of services downloaded by the user. [CHAR LIMIT=50] -->
-    <string name="user_installed_services_category_title">Downloaded apps</string>
+    <string name="user_installed_services_category_title">Downloaded services</string>
     <!-- Title for the accessibility preference category of settings considered to be experimental, meaning they might be changed or removed in the future. [CHAR LIMIT=50] -->
     <string name="experimental_category_title">Experimental</string>
     <!-- Title for feature flags dashboard where developers can turn on experimental features [CHAR LIMIT=50] -->
@@ -4921,7 +4921,7 @@
     <!-- Title for accessibility preference for configuring touch feedback vibrations. -->
     <string name="accessibility_touch_vibration_title">Touch feedback</string>
     <!-- Used in the acessibilty service settings to control turning on/off the service entirely -->
-    <string name="accessibility_service_master_switch_title">Use <xliff:g id="service" example="TalkBack">%1$s</xliff:g></string>
+    <string name="accessibility_service_master_switch_title">Use service</string>
     <!-- Used in the Color correction settings screen to control turning on/off the feature entirely -->
     <string name="accessibility_daltonizer_master_switch_title">Use color correction</string>
     <!-- Used in the Captions settings screen to control turning on/off the feature entirely -->
@@ -5147,7 +5147,7 @@
     </string>
 
     <!-- Title for the action perform in accessibility dialog. [CHAR LIMIT=NONE] -->
-    <string name="accessibility_service_action_perform_title">View and perform actions</string>
+    <string name="accessibility_service_action_perform_title">View and platform actions</string>
 
     <!-- Description for the action perform in accessibility dialog. [CHAR LIMIT=NONE] -->
     <string name="accessibility_service_action_perform_description">It can track your interactions
diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
index f3f2af2129b..d1adf3c6023 100644
--- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
@@ -85,16 +85,6 @@ public class ToggleAccessibilityServicePreferenceFragment
         mLockPatternUtils = new LockPatternUtils(getActivity());
     }
 
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        mSwitchBar.setLabelDelegate((boolean isChecked) -> {
-            final AccessibilityServiceInfo info = getAccessibilityServiceInfo();
-            return getString(R.string.accessibility_service_master_switch_title,
-                    info.getResolveInfo().loadLabel(getPackageManager()));
-        });
-    }
-
     @Override
     public void onResume() {
         mSettingsContentObserver.register(getContentResolver());
@@ -130,7 +120,7 @@ public class ToggleAccessibilityServicePreferenceFragment
                 return serviceInfo;
             }
         }
-        throw new IllegalStateException("ServiceInfo is not found.");
+        return null;
     }
 
     @Override
@@ -138,12 +128,18 @@ public class ToggleAccessibilityServicePreferenceFragment
         switch (dialogId) {
             case DIALOG_ID_ENABLE_WARNING: {
                 final AccessibilityServiceInfo info = getAccessibilityServiceInfo();
+                if (info == null) {
+                    return null;
+                }
                 mDialog = AccessibilityServiceWarning
                         .createCapabilitiesDialog(getActivity(), info, this);
                 break;
             }
             case DIALOG_ID_DISABLE_WARNING: {
                 AccessibilityServiceInfo info = getAccessibilityServiceInfo();
+                if (info == null) {
+                    return null;
+                }
                 mDialog = AccessibilityServiceWarning
                         .createDisableDialog(getActivity(), info, this);
                 break;
diff --git a/src/com/android/settings/widget/SwitchBar.java b/src/com/android/settings/widget/SwitchBar.java
index 33413040e82..f8743d1fa47 100644
--- a/src/com/android/settings/widget/SwitchBar.java
+++ b/src/com/android/settings/widget/SwitchBar.java
@@ -61,16 +61,6 @@ public class SwitchBar extends LinearLayout implements CompoundButton.OnCheckedC
         void onSwitchChanged(Switch switchView, boolean isChecked);
     }
 
-    public interface LabelDelegate {
-        /**
-         * Called to create label and set the title with Accessibility
-         * service name to the textView of switchBar.
-         *
-         * @param isChecked  The checked state of switchView.
-         */
-        String createLabel(boolean isChecked);
-    }
-
     private static final int[] XML_ATTRIBUTES = {
             R.attr.switchBarMarginStart,
             R.attr.switchBarMarginEnd,
@@ -100,7 +90,6 @@ public class SwitchBar extends LinearLayout implements CompoundButton.OnCheckedC
     private boolean mDisabledByAdmin;
     private EnforcedAdmin mEnforcedAdmin = null;
     private String mMetricsTag;
-    private LabelDelegate mLabelDelegate;
 
 
     public SwitchBar(Context context) {
@@ -189,11 +178,7 @@ public class SwitchBar extends LinearLayout implements CompoundButton.OnCheckedC
     }
 
     public void setTextViewLabelAndBackground(boolean isChecked) {
-        if(mLabelDelegate != null) {
-            mLabel = mLabelDelegate.createLabel(isChecked);
-        } else {
-            mLabel = getResources().getString(isChecked ? mOnTextId : mOffTextId);
-        }
+        mLabel = getResources().getString(isChecked ? mOnTextId : mOffTextId);
         setBackgroundColor(isChecked ? mBackgroundActivatedColor : mBackgroundColor);
         updateText();
     }
@@ -398,9 +383,4 @@ public class SwitchBar extends LinearLayout implements CompoundButton.OnCheckedC
 
         requestLayout();
     }
-
-    public void setLabelDelegate(LabelDelegate labelDelegate) {
-        mLabelDelegate = labelDelegate;
-        setTextViewLabelAndBackground(isChecked());
-    }
 }