Merge "Revert "Update emulator config to match real vehicle values"" into main