Merge "Modify block transform skipping check"