Merge "Fix block size computation in coeff token packing" into nextgenv2