Merge "SurfaceControl: Bind close-guard lifetime to native-object lifetime." into rvc-dev