Merge "Disable skia shader cache"