am 9aaafd6f: Merge "    Fix memory Leak due to SurfaceView not being detached."

* commit '9aaafd6f3ce36448f4215ac961cfaaf505db79fd':
  Fix memory Leak due to SurfaceView not being detached.