Merge "Fixed 9-patch scale issue." into devel/master