Merge "SurfaceControl: Bind close-guard lifetime to native-object lifetime." into rvc-dev am: 26351d7c am: 1866c38f Change-Id: Ie749cceba203fbba88445bd8f40f4c19615e6f54