Merge "Using SurfaceControl#remove() instead of release()"