Merge "Merge "Create native Surface object on updateWindow for legacy apps." into oc-dev am: 1e1c5d7b77 am: e2aec03b9c" into oc-dr1-dev-plus-aosp