am b0c939ad: Merge "Prevent crash when detaching a SurfaceView. Bug #3400461" into honeycomb

* commit 'b0c939adfa339c5cbb7f458072119269368b3ba5':
  Prevent crash when detaching a SurfaceView. Bug #3400461