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