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