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