Merge branch '3gpp_issue_1337_fix' into 'main'

Fix for 3GPP issue 1337: energy mismatch when switching from ACELP to TCX [allow regression]

See merge request !1566