Merge "Remove SurfaceSession.nativeKill" into sc-dev