Merge "Use uniform quantizer for sub8x8 block coding" into nextgenv2