diff --git a/res/drawable/circle_outline.xml b/res/drawable/circle_outline.xml
index 1b2631d522d..829d6b9f0a4 100644
--- a/res/drawable/circle_outline.xml
+++ b/res/drawable/circle_outline.xml
@@ -16,6 +16,7 @@
   -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="oval">
+    <solid android:color="@android:color/white"/>
     <stroke
         android:width="1dp"
         android:color="@color/circle_outline_color"/>
diff --git a/src/com/android/settings/development/OverlayCategoryPreferenceController.java b/src/com/android/settings/development/OverlayCategoryPreferenceController.java
index 7a2ee08020f..6e0b2d00f6b 100644
--- a/src/com/android/settings/development/OverlayCategoryPreferenceController.java
+++ b/src/com/android/settings/development/OverlayCategoryPreferenceController.java
@@ -198,8 +198,8 @@ public class OverlayCategoryPreferenceController extends DeveloperOptionsPrefere
     @Override
     protected void onDeveloperOptionsSwitchDisabled() {
         super.onDeveloperOptionsSwitchDisabled();
-        // STOPSHIP b/122308197: reset the overlays to the set in
-        // Settings.Secure.THEME_CUSTOMIZATION_OVERLAY_PACKAGES
+        // TODO b/133222035: remove these developer settings when the
+        // Settings.Secure.THEME_CUSTOMIZATION_OVERLAY_PACKAGES setting is used
         setOverlay(PACKAGE_DEVICE_DEFAULT);
         updateState(mPreference);
     }
diff --git a/src/com/android/settings/network/telephony/NetworkOperatorPreference.java b/src/com/android/settings/network/telephony/NetworkOperatorPreference.java
index a334aeb72fb..2359399478e 100644
--- a/src/com/android/settings/network/telephony/NetworkOperatorPreference.java
+++ b/src/com/android/settings/network/telephony/NetworkOperatorPreference.java
@@ -30,6 +30,7 @@ import android.view.Gravity;
 import androidx.preference.Preference;
 
 import com.android.settings.R;
+import com.android.settings.Utils;
 import com.android.settingslib.graph.SignalDrawable;
 
 import java.util.List;
@@ -144,6 +145,7 @@ public class NetworkOperatorPreference extends Preference {
         // Set the signal strength icon at the bottom right
         icons.setLayerGravity(1 /* index of SignalDrawable */, Gravity.BOTTOM | Gravity.RIGHT);
         icons.setLayerSize(1 /* index of SignalDrawable */, iconSize, iconSize);
+        icons.setTintList(Utils.getColorAttr(context, android.R.attr.colorControlNormal));
         setIcon(icons);
     }
 }
diff --git a/src/com/android/settings/notification/NotificationPreferenceController.java b/src/com/android/settings/notification/NotificationPreferenceController.java
index d09ea4dc3dc..2ae7019ea3c 100644
--- a/src/com/android/settings/notification/NotificationPreferenceController.java
+++ b/src/com/android/settings/notification/NotificationPreferenceController.java
@@ -74,7 +74,9 @@ public abstract class NotificationPreferenceController extends AbstractPreferenc
             return false;
         }
         if (mChannelGroup != null) {
-            return !mChannelGroup.isBlocked();
+            if (mChannelGroup.isBlocked()) {
+                return false;
+            }
         }
         if (mChannel != null) {
             return mChannel.getImportance() != IMPORTANCE_NONE;
diff --git a/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java
index cde5b900cf1..b024cee3632 100644
--- a/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java
@@ -105,10 +105,12 @@ public class NotificationPreferenceControllerTest {
     @Test
     public void isAvailable_notIfChannelBlocked() {
         NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        NotificationChannelGroup group = mock(NotificationChannelGroup.class);
+        when(group.isBlocked()).thenReturn(false);
         NotificationChannel channel = mock(NotificationChannel.class);
         when(channel.getImportance()).thenReturn(IMPORTANCE_NONE);
 
-        mController.onResume(appRow, channel, null, null);
+        mController.onResume(appRow, channel, group, null);
         assertFalse(mController.isAvailable());
     }