Merge "Consider rounded corners in occluded by (tests)"