Merge "Refactor decoder side qcoeff reset" into nextgenv2