Merge "Revert workaround for Skia bug now that Skia has been fixed." into klp-dev