getSizeCustomImage() returned wrong width and height values for cropped images; getSizeDefaultImage() used wrong parameters of getSizeCustomImage()
Merge remote-tracking branch 'upstream/master' into upstream0717
correct fix for 6a1c27528300a0d70125ac7b24dcf05d4e566d9d