Merge "Remove round rect clipping optimization." into oc-dev