Merging ub-launcher3-qt-r1-dev, build 5781802

Test: Manual

Bug:138956269 P2 Color option selector in custom theme truncated in smaller screens
Change-Id: I2f992b381669ed400f3bee3687f10838a0034b62
diff --git a/res/layout/theme_color_option.xml b/res/layout/theme_color_option.xml
index 12fe623..33e4668 100644
--- a/res/layout/theme_color_option.xml
+++ b/res/layout/theme_color_option.xml
@@ -22,8 +22,8 @@
 
     <ImageView
         android:id="@+id/option_tile"
-        android:layout_width="@dimen/component_color_chip_size"
-        android:layout_height="@dimen/component_color_chip_size"
+        android:layout_width="@dimen/component_color_chip_container_size"
+        android:layout_height="@dimen/component_color_chip_container_size"
         android:layout_gravity="center"
         android:src="@drawable/color_chip"/>
 </FrameLayout>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index b6aac0b..a2cb88b 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -96,6 +96,7 @@
     <dimen name="component_icon_thumb_size">40dp</dimen>
 
     <dimen name="component_color_chip_size">32dp</dimen>
+    <dimen name="component_color_chip_container_size">33dp</dimen>
 
     <dimen name="component_shape_thumb_size">72dp</dimen>
     <dimen name="option_border_width">2dp</dimen>