Port MR1860 from float

Basic Info

• Original merge request in float repo: ivas-codec-pc/ivas-codec!1860 (merged)

A part of this MR is also a correction of a bug in porting ivas-codec-pc/ivas-codec!1357 (merged). See #1849 (comment 82711) for deails.