Merge "add temporary cast to allow Skia roll"