Merge "Fix clip rect snapping at non-integer scale values" into nyc-dev