Merge "Make libpng recovery_available"