Merge change 24473 into eclair

* changes:
  fix [2074427] SurfaceView doesn't disappear on GONE