Merge "Fix NinePatch insets scaling" into nyc-dev