Merge "Calculate clip bounds correctly when serializing" into nyc-dev