Merge "Refactor ThemePickerCustomizationOptionBinder (1/2)" into main