Merge "Enable Skia shader cache"