diff --git a/src/com/android/customization/model/color/ColorSectionController.java b/src/com/android/customization/model/color/ColorSectionController.java
index 1de1c04..3b8a927 100644
--- a/src/com/android/customization/model/color/ColorSectionController.java
+++ b/src/com/android/customization/model/color/ColorSectionController.java
@@ -65,7 +65,6 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Optional;
-import java.util.UUID;
 
 /**
  * Color section view's controller for the logic of color customization.
@@ -75,6 +74,9 @@
     private static final String TAG = "ColorSectionController";
     private static final String KEY_COLOR_TAB_POSITION = "COLOR_TAB_POSITION";
     private static final String KEY_COLOR_PAGE_POSITION = "COLOR_PAGE_POSITION";
+    private static final String ID_VIEWPAGER = "ColorSectionController_colorSectionViewPager";
+    private static final String ID_ITEMVIEW = "ColorSectionController_itemView";
+    private static final String ID_CONTAINER = "ColorSectionController_container";
     private static final long MIN_COLOR_APPLY_PERIOD = 500L;
 
     private static final int WALLPAPER_TAB_INDEX = 0;
@@ -160,7 +162,7 @@
         mColorSectionView = (ColorSectionView) LayoutInflater.from(context).inflate(
                 R.layout.color_section_view, /* root= */ null);
         mColorSectionViewPager = mColorSectionView.findViewById(R.id.color_section_view_pager);
-        mColorSectionViewPager.setAccessibilityDelegate(mAccessibilityDelegate);
+        mColorSectionViewPager.setAccessibilityDelegate(createAccessibilityDelegate(ID_VIEWPAGER));
         mColorSectionViewPager.setAdapter(mColorSectionAdapter);
         mColorSectionViewPager.setUserInputEnabled(false);
         if (ColorProvider.themeStyleEnabled) {
@@ -409,13 +411,15 @@
         return action;
     }
 
-    private View.AccessibilityDelegate mAccessibilityDelegate = new View.AccessibilityDelegate() {
-        @Override
-        public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfo info) {
-            super.onInitializeAccessibilityNodeInfo(host, info);
-            info.setUniqueId(UUID.randomUUID().toString());
-        }
-    };
+    private View.AccessibilityDelegate createAccessibilityDelegate(String id) {
+        return new View.AccessibilityDelegate() {
+            @Override
+            public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfo info) {
+                super.onInitializeAccessibilityNodeInfo(host, info);
+                info.setUniqueId(id);
+            }
+        };
+    }
 
     private class ColorSectionAdapter extends
             RecyclerView.Adapter<ColorSectionAdapter.ColorPageViewHolder> {
@@ -482,8 +486,8 @@
                 if (ColorProvider.themeStyleEnabled) {
                     mPageIndicator.setVisibility(VISIBLE);
                 }
-                itemView.setAccessibilityDelegate(mAccessibilityDelegate);
-                mContainer.setAccessibilityDelegate(mAccessibilityDelegate);
+                itemView.setAccessibilityDelegate(createAccessibilityDelegate(ID_ITEMVIEW));
+                mContainer.setAccessibilityDelegate(createAccessibilityDelegate(ID_CONTAINER));
             }
         }
     }
