Merge "Improve nine patch scaling"