Merge "Explicitly encode SkImages with Png encoder" into main