Merge "Reduce PNG encode time" into devel/master