Settings Form uses overriden instead of saved configuration

I'm not sure if this is a bug or works as designed, so leaving to needs review. Can confirm that the steps to reproduce and then switching to MR show the described issue and fix for it, I'm just not sure what's the correct behavior here. One would assume if the config is saved and then that is overridden it's overridden for a reason and probably should be saved to the form and displayed to the user. So that the user does not re-save without the override. Like I said, not sure what's the correct approach here, so leaving to needs review.