Port MR2125 from float

Basic Info

• Original merge request in float repo: ivas-codec-pc/ivas-codec!2125 (merged) (merged)
• Also incorporates MR ivas-codec-pc/ivas-codec!1622 (merged) (merged)