diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
index 0bcebf9f83dfe..d2f8a39cc8fbd 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
@@ -3355,8 +3355,8 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd
 
     @ShadeViewRefactor(RefactorComponent.COORDINATOR)
     void onViewAddedInternal(ExpandableView child) {
-        updateHideSensitiveForChild(child);
         child.setOnHeightChangedListener(mOnChildHeightChangedListener);
+        updateHideSensitiveForChild(child);
         generateAddAnimation(child, false /* fromMoreCard */);
         updateAnimationState(child);
         updateChronometerForChild(child);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java
index 344ad4a00c34c..e724e65e98a2d 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java
@@ -95,16 +95,11 @@ public class NotificationStackScrollLayoutController {
         mNotificationRoundnessManager.setOnRoundingChangedCallback(mView::invalidate);
         mView.addOnExpandedHeightChangedListener(mNotificationRoundnessManager::setExpanded);
 
-        mTunerService.addTunable(
-                (key, newValue) -> {
-                    if (key.equals(Settings.Secure.NOTIFICATION_DISMISS_RTL)) {
-                        mView.updateDismissRtlSetting("1".equals(newValue));
-                    } else if (key.equals(Settings.Secure.NOTIFICATION_HISTORY_ENABLED)) {
-                        updateFooter();
-                    }
-                },
-                Settings.Secure.NOTIFICATION_DISMISS_RTL,
-                Settings.Secure.NOTIFICATION_HISTORY_ENABLED);
+        mTunerService.addTunable((key, newValue) -> {
+            if (key.equals(Settings.Secure.NOTIFICATION_DISMISS_RTL)) {
+                mView.updateDismissRtlSetting("1".equals(newValue));
+            }
+        }, HIGH_PRIORITY, Settings.Secure.NOTIFICATION_DISMISS_RTL);
     }
 
     public void addOnExpandedHeightChangedListener(BiConsumer<Float, Float> listener) {