Merge "Fix unsafety in SkiaShader storage, and texture unit accounting" into mnc-dev