Merge "Release the surface control view host when addWindow fail." into tm-dev