Merge branch '1072-complexity-high-complexity-overhead-for-osba-decoding' of...

Merge branch '1072-complexity-high-complexity-overhead-for-osba-decoding' of forge.3gpp.org:sa4/audio/ivas-basop into 1072-complexity-high-complexity-overhead-for-osba-decoding

resolve conflicts