[nvidia-settings/f40: 3/3] Merge branch 'master' into f40