Merge "Fixes touch targets for several tabs in ThemePicker" into udc-dev