diff --git a/res/layout/notification_history.xml b/res/layout/notification_history.xml
index a97afb66eee..b3308c5ffb0 100644
--- a/res/layout/notification_history.xml
+++ b/res/layout/notification_history.xml
@@ -19,8 +19,7 @@
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:id="@+id/scroll"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@*android:color/material_grey_50">
+    android:layout_height="match_parent">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -100,17 +99,13 @@
                     android:layout_height="wrap_content"
                     android:clipChildren="true"
                     android:elevation="3dp"
-                    android:background="@drawable/rounded_bg"
-                    settings:layout_constraintHeight_max="200dp"
-                    settings:layout_constrainedHeight="true">
+                    android:background="@drawable/rounded_bg">
 
                     <androidx.recyclerview.widget.RecyclerView
                         android:id="@+id/notification_list"
                         android:layout_width="match_parent"
-                        android:layout_height="0dp"
+                        android:layout_height="wrap_content"
                         android:clipChildren="true"
-                        settings:layout_constraintHeight_max="300dp"
-                        settings:layout_constrainedHeight="true"
                         settings:fastScrollEnabled="true"
                         settings:fastScrollHorizontalThumbDrawable="@drawable/thumb_drawable"
                         settings:fastScrollHorizontalTrackDrawable="@drawable/line_drawable"
@@ -144,10 +139,8 @@
                     <androidx.recyclerview.widget.RecyclerView
                         android:id="@+id/notification_list"
                         android:layout_width="match_parent"
-                        android:layout_height="0dp"
+                        android:layout_height="wrap_content"
                         android:clipChildren="true"
-                        settings:layout_constraintHeight_max="300dp"
-                        settings:layout_constrainedHeight="true"
                         settings:fastScrollEnabled="true"
                         settings:fastScrollHorizontalThumbDrawable="@drawable/thumb_drawable"
                         settings:fastScrollHorizontalTrackDrawable="@drawable/line_drawable"
diff --git a/src/com/android/settings/notification/history/NotificationHistoryActivity.java b/src/com/android/settings/notification/history/NotificationHistoryActivity.java
index a02d3aabe6a..9b78ae987b6 100644
--- a/src/com/android/settings/notification/history/NotificationHistoryActivity.java
+++ b/src/com/android/settings/notification/history/NotificationHistoryActivity.java
@@ -129,6 +129,7 @@ public class NotificationHistoryActivity extends Activity {
 
         mPm = getPackageManager();
 
+        mTodayView.removeAllViews();
         mHistoryLoader = new HistoryLoader(this, new NotificationBackend(), mPm);
         mHistoryLoader.load(mOnHistoryLoaderListener);
 
@@ -245,16 +246,18 @@ public class NotificationHistoryActivity extends Activity {
                 LinearLayoutManager lm = new LinearLayoutManager(NotificationHistoryActivity.this);
                 rv.setLayoutManager(lm);
                 rv.setAdapter(new NotificationSbnAdapter(NotificationHistoryActivity.this, mPm));
-                ((NotificationSbnAdapter) rv.getAdapter()).onRebuildComplete(
-                        Arrays.asList(snoozed));
                 DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(
                         rv.getContext(), lm.getOrientation());
                 rv.addItemDecoration(dividerItemDecoration);
+                rv.setNestedScrollingEnabled(false);
+
+                ((NotificationSbnAdapter) rv.getAdapter()).onRebuildComplete(
+                        Arrays.asList(snoozed));
             }
 
             try {
                 StatusBarNotification[] dismissed = mNm.getHistoricalNotifications(
-                        NotificationHistoryActivity.this.getPackageName(), 10, false);
+                        NotificationHistoryActivity.this.getPackageName(), 6, false);
                 RecyclerView rv = mDismissView.findViewById(R.id.notification_list);
                 LinearLayoutManager lm = new LinearLayoutManager(NotificationHistoryActivity.this);
                 rv.setLayoutManager(lm);
@@ -262,6 +265,8 @@ public class NotificationHistoryActivity extends Activity {
                 DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(
                         rv.getContext(), lm.getOrientation());
                 rv.addItemDecoration(dividerItemDecoration);
+                rv.setNestedScrollingEnabled(false);
+
                 ((NotificationSbnAdapter) rv.getAdapter()).onRebuildComplete(
                         Arrays.asList(dismissed));
                 mDismissView.setVisibility(View.VISIBLE);
diff --git a/src/com/android/settings/notification/history/NotificationSbnAdapter.java b/src/com/android/settings/notification/history/NotificationSbnAdapter.java
index 77740d7be59..a35b5d4cf22 100644
--- a/src/com/android/settings/notification/history/NotificationSbnAdapter.java
+++ b/src/com/android/settings/notification/history/NotificationSbnAdapter.java
@@ -94,6 +94,13 @@ public class NotificationSbnAdapter extends
     }
 
     public void onRebuildComplete(List<StatusBarNotification> notifications) {
+        // summaries are low content; don't bother showing them
+        for (int i = notifications.size() - 1; i >= 0; i--) {
+            StatusBarNotification sbn = notifications.get(i);
+            if (sbn.isGroup() && sbn.getNotification().isGroupSummary()) {
+                notifications.remove(i);
+            }
+        }
         mValues = notifications;
         notifyDataSetChanged();
     }