Merge "Populate both VehiclePropConfig and VehicleAreaConfig.access" into main