diff --git a/res/layout/screen_zoom_preview_1.xml b/res/layout/screen_zoom_preview_1.xml
index a0ee532..4aabfe4 100644
--- a/res/layout/screen_zoom_preview_1.xml
+++ b/res/layout/screen_zoom_preview_1.xml
@@ -29,7 +29,6 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="?android:attr/colorBackground"
             android:paddingTop="@dimen/conversation_message_list_padding"
             android:paddingStart="@dimen/conversation_message_list_padding"
             android:paddingEnd="@dimen/conversation_message_list_padding"
diff --git a/res/layout/screen_zoom_preview_settings.xml b/res/layout/screen_zoom_preview_settings.xml
index 998d221..c790e03 100644
--- a/res/layout/screen_zoom_preview_settings.xml
+++ b/res/layout/screen_zoom_preview_settings.xml
@@ -19,7 +19,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fillViewport="true"
-    android:background="?android:attr/colorBackground"
     android:importantForAccessibility="noHideDescendants">
 
     <view class="com.android.settings.TouchBlockingFrameLayout"
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 890a945..02f94d2 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -253,6 +253,7 @@
         <item name="android:navigationBarDividerColor">@*android:color/navigation_bar_divider_device_default_settings</item>
 
         <item name="android:colorPrimary">@android:color/white</item>
+        <item name="android:colorBackground">@android:color/white</item>
         <item name="android:colorPrimaryDark">@android:color/white</item>
         <item name="android:colorAccent">@color/material_blue_700</item>
     </style>
diff --git a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
index 2b9ca48..b28e2bf 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
@@ -90,6 +90,8 @@
                 .setSourceMetricsCategory(caller instanceof Instrumentable
                         ? ((Instrumentable) caller).getMetricsCategory()
                         : Instrumentable.METRICS_CATEGORY_UNKNOWN)
+                .setExtras(SetupWizardUtils.copyLifecycleExtra(getIntent().getExtras(),
+                        new Bundle()))
                 .launch();
         return true;
     }
diff --git a/src/com/android/settings/notification/history/NotificationHistoryAdapter.java b/src/com/android/settings/notification/history/NotificationHistoryAdapter.java
index df0d9e4..0683ef7 100644
--- a/src/com/android/settings/notification/history/NotificationHistoryAdapter.java
+++ b/src/com/android/settings/notification/history/NotificationHistoryAdapter.java
@@ -78,7 +78,7 @@
         holder.setTitle(hn.getTitle());
         holder.setSummary(hn.getText());
         holder.setPostedTime(hn.getPostedTimeMs());
-        holder.itemView.setOnClickListener(v -> {
+        final View.OnClickListener onClick = v -> {
             mUiEventLogger.logWithPosition(NotificationHistoryActivity.NotificationHistoryEvent
                     .NOTIFICATION_HISTORY_OLDER_ITEM_CLICK, hn.getUid(), hn.getPackage(), position);
             Intent intent =  new Intent(Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS)
@@ -87,6 +87,11 @@
                     .putExtra(EXTRA_CONVERSATION_ID, hn.getConversationId());
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             holder.itemView.getContext().startActivityAsUser(intent, UserHandle.of(hn.getUserId()));
+        };
+        holder.itemView.setOnClickListener(onClick);
+        holder.itemView.setOnLongClickListener(l -> {
+            onClick.onClick(l);
+            return true;
         });
         holder.itemView.setAccessibilityDelegate(new View.AccessibilityDelegate() {
             @Override