Merge "Remove feature flag "settings_dynamic_system""