[nvidia-settings/f30: 5/5] Merge branch 'master' into f30