[nvidia-settings/f28: 2/2] Merge branch 'f30' into f28