[th/various-settings-cleanup-2]
More patches that are fall-out of the settings plugin rework.
They have a loose topic, something around "NMSettings", but merge them early because they are simple on their own.
Also, I want to see that CI passes for them...