Hotfix and cleanup for system mixers
Merge branch 'px4' into alpha