Merge "Fix ChangeImageTransform for drawables without intrinsic size"