Merge "Fix ninepatch scaling." into mnc-ub-dev