Merge "SurfaceControl: Bind close-guard lifetime to native-object lifetime." into rvc-dev am: 26351d7c am: 4a0048f2 Change-Id: I73c43f90c3eee5ed765382694616302ff04aa5de