Merge "Fix failing SkiaPipeline unit tests"