Merge branch 'bug_fix_saturation_removal_macro_correction' into 'main'

Bug fix in CNG_enc_ivas_fx, saturation removal and correction of macro value for MASA path

See merge request !1308