[split-non-BE] [non-BE] Port MR 1395 into main-pc

• Link to issue in BASOP repo: #1619 (closed)
• Link to original MR in float repo: ivas-codec-pc/ivas-codec!1395 (merged)
• Requested reviewers: