Merge "Fix nullability issues in SettingsProxy classes" into main