Small refactor in streaming client

Set maximum timeout to 50s (although polling will continue at normal 20s).