Merge "Use Window Context for SurfaceControlViewHost." into tm-dev