Merge "Fix the use case of plane_block_idx in sub8x8 RD"