[nvidia-settings/el8: 2/2] Merge branch 'master' into el8