Merge "Revert "fix: show overrides in device_config list"" into main