Merge "Update layout for grid options" into sc-dev
diff --git a/src_overridecustom/com/android/customization/picker/CustomizationPickerActivity.java b/src_overridecustom/com/android/customization/picker/CustomizationPickerActivity.java
index f1f1e72..e352879 100644
--- a/src_overridecustom/com/android/customization/picker/CustomizationPickerActivity.java
+++ b/src_overridecustom/com/android/customization/picker/CustomizationPickerActivity.java
@@ -516,7 +516,7 @@
             return;
         }
 
-        if (!ActivityUtils.isLaunchedFromSettings(getIntent())) {
+        if (!ActivityUtils.isLaunchedFromSettingsRelated(getIntent())) {
             Intent intent = new Intent(Settings.ACTION_SETTINGS);
             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
             startActivity(intent);