Merge "store quant_shift as an unsigned char"