[nvidia-settings-470xx/f35: 2/2] Merge branch 'master' into f35