Merge "SurfaceTexture: add context attach & detach"