Merge "Correct dissapearing SurfaceView during exit animations."