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