Merge "Add a method to hide/show a SurfaceView's surface." into froyo