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

Change-Id: Ia2aca0e16fac6092f812b063d76f64c1ae7b6113