Merge "Merge "Upgrade libpng to v1.6.38" am: 1640fa9077" into main-16k