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