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