Merge "Fix the scaling factor in UV skipping test"