[nvidia-settings/f32: 4/4] Merge branch 'master' into f32