diff --git a/res/layout/night_display_activation_button.xml b/res/layout/night_display_activation_button.xml
index 8765ff7ea0e..df160ec33b8 100644
--- a/res/layout/night_display_activation_button.xml
+++ b/res/layout/night_display_activation_button.xml
@@ -24,7 +24,6 @@
     <Button
         android:id="@+id/night_display_turn_on_button"
         style="@style/ActionPrimaryButton"
-        android:focusableInTouchMode="true"
         android:layout_marginStart="@dimen/screen_margin_sides"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -33,7 +32,6 @@
     <Button
         android:id="@+id/night_display_turn_off_button"
         style="@style/ActionSecondaryButton"
-        android:focusableInTouchMode="true"
         android:layout_marginStart="@dimen/screen_margin_sides"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/res/layout/zen_mode_settings_button.xml b/res/layout/zen_mode_settings_button.xml
index f234a899d7e..db889ff9300 100644
--- a/res/layout/zen_mode_settings_button.xml
+++ b/res/layout/zen_mode_settings_button.xml
@@ -38,7 +38,6 @@
         android:layout_marginTop="@dimen/zen_mode_settings_button_margin_vertical"
         android:layout_marginBottom="@dimen/zen_mode_settings_button_margin_vertical"
         android:text="@string/zen_mode_button_turn_on"
-        android:focusableInTouchMode="true"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 
@@ -50,7 +49,6 @@
         android:layout_marginTop="@dimen/zen_mode_settings_button_margin_vertical"
         android:layout_marginBottom="@dimen/zen_mode_settings_button_margin_vertical"
         android:text="@string/zen_mode_button_turn_off"
-        android:focusableInTouchMode="true"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 
diff --git a/src/com/android/settings/display/NightDisplayActivationPreferenceController.java b/src/com/android/settings/display/NightDisplayActivationPreferenceController.java
index 4b1e295445d..cf9332bfcc3 100644
--- a/src/com/android/settings/display/NightDisplayActivationPreferenceController.java
+++ b/src/com/android/settings/display/NightDisplayActivationPreferenceController.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.display;
 
+import static android.view.accessibility.AccessibilityEvent.TYPE_VIEW_FOCUSED;
+
 import android.content.Context;
 import android.hardware.display.ColorDisplayManager;
 import android.text.TextUtils;
@@ -39,20 +41,16 @@ public class NightDisplayActivationPreferenceController extends TogglePreference
     private NightDisplayTimeFormatter mTimeFormatter;
     private LayoutPreference mPreference;
 
-    // Night light can also be toggled from QS. If night light wasn't toggled by this preference,
-    // don't requestFocus
-    private boolean mButtonTriggered = false;
     private Button mTurnOffButton;
     private Button mTurnOnButton;
 
     private final OnClickListener mListener = new OnClickListener() {
         @Override
         public void onClick(View v) {
-            mButtonTriggered = true;
             mMetricsFeatureProvider.logClickedPreference(mPreference, getMetricsCategory());
             mColorDisplayManager.setNightDisplayActivated(
                     !mColorDisplayManager.isNightDisplayActivated());
-            updateStateInternal();
+            updateStateInternal(true);
         }
     };
 
@@ -93,7 +91,7 @@ public class NightDisplayActivationPreferenceController extends TogglePreference
 
     @Override
     public final void updateState(Preference preference) {
-        updateStateInternal();
+        updateStateInternal(false);
     }
 
     /** FOR SLICES */
@@ -113,7 +111,7 @@ public class NightDisplayActivationPreferenceController extends TogglePreference
         return mTimeFormatter.getAutoModeSummary(mContext, mColorDisplayManager);
     }
 
-    private void updateStateInternal() {
+    private void updateStateInternal(boolean selfChanged) {
         if (mTurnOnButton == null || mTurnOffButton == null) {
             return;
         }
@@ -143,17 +141,15 @@ public class NightDisplayActivationPreferenceController extends TogglePreference
             mTurnOnButton.setVisibility(View.GONE);
             mTurnOffButton.setVisibility(View.VISIBLE);
             mTurnOffButton.setText(buttonText);
-            if (mButtonTriggered) {
-                mButtonTriggered = false;
-                mTurnOffButton.requestFocus();
+            if (selfChanged) {
+                mTurnOffButton.sendAccessibilityEvent(TYPE_VIEW_FOCUSED);
             }
         } else {
             mTurnOnButton.setVisibility(View.VISIBLE);
             mTurnOffButton.setVisibility(View.GONE);
             mTurnOnButton.setText(buttonText);
-            if (mButtonTriggered) {
-                mButtonTriggered = false;
-                mTurnOnButton.requestFocus();
+            if (selfChanged) {
+                mTurnOnButton.sendAccessibilityEvent(TYPE_VIEW_FOCUSED);
             }
         }
     }
diff --git a/src/com/android/settings/homepage/contextualcards/EligibleCardChecker.java b/src/com/android/settings/homepage/contextualcards/EligibleCardChecker.java
index 4e8c61f8fad..017bdb53fdb 100644
--- a/src/com/android/settings/homepage/contextualcards/EligibleCardChecker.java
+++ b/src/com/android/settings/homepage/contextualcards/EligibleCardChecker.java
@@ -35,13 +35,10 @@ import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
 import java.util.List;
 import java.util.concurrent.Callable;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
 
 public class EligibleCardChecker implements Callable<ContextualCard> {
 
     private static final String TAG = "EligibleCardChecker";
-    private static final long LATCH_TIMEOUT_MS = 300;
 
     private final Context mContext;
 
@@ -54,7 +51,7 @@ public class EligibleCardChecker implements Callable<ContextualCard> {
     }
 
     @Override
-    public ContextualCard call() throws Exception {
+    public ContextualCard call() {
         final long startTime = System.currentTimeMillis();
         final MetricsFeatureProvider metricsFeatureProvider =
                 FeatureFactory.getFactory(mContext).getMetricsFeatureProvider();
@@ -113,35 +110,10 @@ public class EligibleCardChecker implements Callable<ContextualCard> {
     @VisibleForTesting
     Slice bindSlice(Uri uri) {
         final SliceViewManager manager = SliceViewManager.getInstance(mContext);
-        final Slice[] returnSlice = new Slice[1];
-        final CountDownLatch latch = new CountDownLatch(1);
-        final SliceViewManager.SliceCallback callback =
-                new SliceViewManager.SliceCallback() {
-                    @Override
-                    public void onSliceUpdated(Slice slice) {
-                        try {
-                            // We are just making sure the existence of the slice, so ignore
-                            // slice loading state here.
-                            returnSlice[0] = slice;
-                            latch.countDown();
-                        } catch (Exception e) {
-                            Log.w(TAG, uri + " cannot be indexed", e);
-                        } finally {
-                            manager.unregisterSliceCallback(uri, this);
-                        }
-                    }
-                };
-        // Register a callback until we get a loaded slice.
-        manager.registerSliceCallback(uri, callback);
-        // Trigger the binding.
-        callback.onSliceUpdated(manager.bindSlice(uri));
-        try {
-            latch.await(LATCH_TIMEOUT_MS, TimeUnit.MILLISECONDS);
-        } catch (InterruptedException e) {
-            Log.w(TAG, "Error waiting for slice binding for uri" + uri, e);
-            manager.unregisterSliceCallback(uri, callback);
-        }
-        return returnSlice[0];
+        manager.pinSlice(uri);
+        final Slice slice = manager.bindSlice(uri);
+        manager.unpinSlice(uri);
+        return slice;
     }
 
     @VisibleForTesting
diff --git a/src/com/android/settings/notification/zen/ZenModeButtonPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeButtonPreferenceController.java
index e97cbba03f7..dc338bd5ac2 100644
--- a/src/com/android/settings/notification/zen/ZenModeButtonPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModeButtonPreferenceController.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.notification.zen;
 
+import static android.view.accessibility.AccessibilityEvent.TYPE_VIEW_FOCUSED;
+
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.provider.Settings;
@@ -40,8 +42,9 @@ public class ZenModeButtonPreferenceController extends AbstractZenModePreference
     private static final String TAG = "EnableZenModeButton";
     private final FragmentManager mFragment;
 
-    // DND can also be toggled from QS. If DND wasn't toggled by this preference, don't requestFocus
-    private boolean mButtonTriggered = false;
+    // DND can also be toggled from QS. If DND wasn't toggled by this preference, don't
+    // reroute focus.
+    private boolean mRefocusButton = false;
     private Button mZenButtonOn;
     private Button mZenButtonOff;
 
@@ -75,7 +78,7 @@ public class ZenModeButtonPreferenceController extends AbstractZenModePreference
             mZenButtonOff = ((LayoutPreference) preference)
                     .findViewById(R.id.zen_mode_settings_turn_off_button);
             mZenButtonOff.setOnClickListener(v -> {
-                mButtonTriggered = true;
+                mRefocusButton = true;
                 writeMetrics(preference, false);
                 mBackend.setZenMode(Settings.Global.ZEN_MODE_OFF);
             });
@@ -91,9 +94,9 @@ public class ZenModeButtonPreferenceController extends AbstractZenModePreference
             case Settings.Global.ZEN_MODE_NO_INTERRUPTIONS:
                 mZenButtonOff.setVisibility(View.VISIBLE);
                 mZenButtonOn.setVisibility(View.GONE);
-                if (mButtonTriggered) {
-                    mButtonTriggered = false;
-                    mZenButtonOff.requestFocus();
+                if (mRefocusButton) {
+                    mRefocusButton = false;
+                    mZenButtonOff.sendAccessibilityEvent(TYPE_VIEW_FOCUSED);
                 }
                 break;
             case Settings.Global.ZEN_MODE_OFF:
@@ -101,16 +104,16 @@ public class ZenModeButtonPreferenceController extends AbstractZenModePreference
                 mZenButtonOff.setVisibility(View.GONE);
                 updateZenButtonOnClickListener(preference);
                 mZenButtonOn.setVisibility(View.VISIBLE);
-                if (mButtonTriggered) {
-                    mButtonTriggered = false;
-                    mZenButtonOn.requestFocus();
+                if (mRefocusButton) {
+                    mRefocusButton = false;
+                    mZenButtonOn.sendAccessibilityEvent(TYPE_VIEW_FOCUSED);
                 }
         }
     }
 
     private void updateZenButtonOnClickListener(Preference preference) {
         mZenButtonOn.setOnClickListener(v -> {
-            mButtonTriggered = true;
+            mRefocusButton = true;
             writeMetrics(preference, true);
             int zenDuration = getZenDuration();
             switch (zenDuration) {
diff --git a/src/com/android/settings/password/BiometricFragment.java b/src/com/android/settings/password/BiometricFragment.java
index fc9e42e00fa..de2a1ffeaf2 100644
--- a/src/com/android/settings/password/BiometricFragment.java
+++ b/src/com/android/settings/password/BiometricFragment.java
@@ -124,7 +124,8 @@ public class BiometricFragment extends InstrumentedFragment {
 
     private void cleanup() {
         if (getActivity() != null) {
-            getActivity().getSupportFragmentManager().beginTransaction().remove(this).commit();
+            getActivity().getSupportFragmentManager().beginTransaction().remove(this)
+                    .commitAllowingStateLoss();
         }
     }
 
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/EligibleCardCheckerTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/EligibleCardCheckerTest.java
index 613062fea14..67f0462c823 100644
--- a/tests/robotests/src/com/android/settings/homepage/contextualcards/EligibleCardCheckerTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/EligibleCardCheckerTest.java
@@ -77,9 +77,9 @@ public class EligibleCardCheckerTest {
 
     @Test
     public void isCardEligibleToDisplay_invalidScheme_returnFalse() {
-        final Uri sliceUri = Uri.parse("contet://com.android.settings.slices/action/flashlight");
+        final Uri invalidUri = Uri.parse("contet://com.android.settings.slices/action/flashlight");
 
-        assertThat(mEligibleCardChecker.isCardEligibleToDisplay(getContextualCard(sliceUri)))
+        assertThat(mEligibleCardChecker.isCardEligibleToDisplay(getContextualCard(invalidUri)))
                 .isFalse();
     }
 
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRendererTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRendererTest.java
index 722833c8b04..06edf2baa4d 100644
--- a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRendererTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRendererTest.java
@@ -86,10 +86,10 @@ public class SliceContextualCardRendererTest {
 
     @Test
     public void bindView_invalidScheme_sliceShouldBeNull() {
-        final Uri sliceUri = Uri.parse("contet://com.android.settings.slices/action/flashlight");
+        final Uri invalidUri = Uri.parse("contet://com.android.settings.slices/action/flashlight");
         final RecyclerView.ViewHolder viewHolder = getSliceViewHolder();
 
-        mRenderer.bindView(viewHolder, buildContextualCard(sliceUri));
+        mRenderer.bindView(viewHolder, buildContextualCard(invalidUri));
 
         assertThat(
                 ((SliceFullCardRendererHelper.SliceViewHolder) viewHolder).sliceView.getSlice())