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