Merge "Simplify ThemePicker dependencies" into main