Merge "Make sure we have a native Surface in nContextSetSurface."