Merge "Apply staged flags in SettingsProvider." into main