Merged PX4 config widget
Merged config changes from upstream