Merge "Fix SkSurface cache."