Merge "Fix clipRect transform rounding errors" into nyc-dev