Merge "SurfaceControl: Close CloseGuard when destroying surface in transaction." into pi-dev
am: 625de7758b

Change-Id: I254ad6e09b1e5a0677d4dfc52a6abe875c89e79d