Merge "Disallow negative scale matrices in merged Bitmap drawing" into klp-dev