Merge "Fix matrix mapping of negative rects" into nyc-dev