Merge pull request #9643 from hydra/bf-fix-video-configuration-for-frskyosd