Merge "Fix bytesPerPixel for SurfaceTexture" into nyc-dev