Merge branch 'console-fixes' into drm-next