[nvidia-settings-470xx/f36: 3/3] Merge branch 'master' into f36