Merge branch 'va/contribution-omasa-combined-format-fixes' into...

Merge branch 'va/contribution-omasa-combined-format-fixes' into 'nokia/contribution-omasa-combined-format'

Unified/MDCT stereo switching for 3ISM @96 kbps and 4ISM @128 kbps in OMASA

See merge request !598