Merge "Fix wrong inset bounds" into nyc-dev