[xorg-x11-drv-nvidia-390xx/f32: 5/5] Merge 'Adjust virtual providers' change