Merge "Fix some usage of removed private Skia functions & transitive dep" into main