Merge "Add missing FlickerConfigProvider" into main