Merge pull request #3031 from cleanflight/fix-osd-slave-settings (#5424)