Merge "SurfaceControl: Bind close-guard lifetime to native-object lifetime." into rvc-dev am: 26351d7c4d am: 4a0048f233 am: 4340f2f3c2

Change-Id: I5d6f8aaede653a309c630bea7afce8972805c032