Merge "Camera: legecy: disconnect JPEG surface at exit"