Merge "Create native Surface object on updateWindow for legacy apps." into oc-dev