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