Merge "Update writeFlagOverrideRequest call in SettingsState" into main