Merge "Give an 9-patch error on too many rows and columns"