Merge "Return EXIF thumbnails when available." into klp-dev