Merge "Limit the scope of clip path to the group, not global"