Merge branch 'drm-switcheroo-fixes' into drm-testing