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