Merge "Revert "Correct dissapearing SurfaceView during exit animations.""