Merge "Fix ThemePicker for use_resource_processor: true" into main