Merge "Use getter for thumbnail from converted ThumbnailData in Java" into main