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

* commit '42716619ca1bbcb940a2c295afe832adab71e749':
  Fix memory Leak due to SurfaceView not being detached.