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

Change-Id: Ie811e104290acde7d6843184b5ab4de6b85ebb4b