Merge "Stop magnifying surface insets." into nyc-dev