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