Merge "Remove old_block_idx_4x4" into experimental