Merge "Fix broken encoding process at sub8x8 block size"