Merge "Add guard for upcoming Skia change"