Releasing SurfaceControl when they are no longer needed
am: 0382dd76e8

Change-Id: I5038e4ecd892a7e23658c9aa7c59a2e3beef7363