Merge "SurfaceView: Fix Surface leak when changing format."