Merge "SurfaceControl: Bind close-guard lifetime to native-object lifetime." into rvc-dev am: 26351d7c4d am: 1866c38fb1 am: facb1445df

Change-Id: Ic8853c4420b3a588cd9220829bf47f471c27e4eb