Merge "    Fix memory Leak due to SurfaceView not being detached."