[nvidia-settings/f39: 4/4] Merge branch 'master' into f39