Merge "Revert "Fix nullability issues in SettingsProxy classes"" into main