Merge "Fix nine patch scaling"