Merge "Updated native SurfaceControl APIs to reflect their behavior." into sc-dev