Merge "Rewrite UidRanges::overlaps()"