[nvidia-xconfig/f38: 4/4] Merge branch 'master' into f38