Merge remote branch 'korg/drm-nvidia-switch-fixes' into drm-core-next