Merge "Create native Surface object on updateWindow for legacy apps." into oc-dev am: 1e1c5d7b77 am: 14d9e3a529
am: d44baa3b7d

Change-Id: I048fb1820809ae04b6acbbf5285459ff17db3ce1