Merge "Properly handle the negative scaling factor of canvas in VectorDrawable"