Merge "Limit the scope of clip-path, so update the test"