Combine shapes where possible

[dnfield]

We can do this for shapes with identical painting properties when

• The shapes have no overlap
• Any overlap is completely opaque

This would have the benefit of safely removing overdraw in some cases.