Merge "Keep the ImageData size info consistent with MediaStore and Exif" into gb-ub-photos-carlsbad