diff --git a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java
index e623ed0..c9f945e 100644
--- a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java
+++ b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java
@@ -233,7 +233,7 @@
 
         private void clearAllTasks() {
             RecentsView recentsView =
-                    mTaskContainer.getThumbnailViewDeprecated().getTaskView().getRecentsView();
+                    mTaskContainer.getTaskView().getRecentsView();
             recentsView.dismissAllTasks(null);
         }
 
diff --git a/src/com/android/launcher3/settings/SettingsActivity.java b/src/com/android/launcher3/settings/SettingsActivity.java
index 6a0527c..50c1c7b 100644
--- a/src/com/android/launcher3/settings/SettingsActivity.java
+++ b/src/com/android/launcher3/settings/SettingsActivity.java
@@ -508,7 +508,11 @@
                         parser.getDepth() > depth) && type != XmlPullParser.END_DOCUMENT) {
                     if ((type == XmlPullParser.START_TAG)
                             && GridOption.TAG_NAME.equals(parser.getName())) {
-                        GridOption gridOption = new GridOption(getContext(), Xml.asAttributeSet(parser));
+                        GridOption gridOption = new GridOption
+                        (
+                            getContext(), Xml.asAttributeSet(parser),
+                            DisplayController.INSTANCE.get(getContext()).getInfo()
+                        );
                         if (gridOption.isEnabled(deviceType)) {
                             result.add(gridOption);
                         }