Merge "Make StreamRedirector try to exhaust itself before exiting"