Merge "Revert "Encode paletted PNGs more efficiently""