Update streaming range patch with Martin's token deadlock fixes

Change-Id: Id3b8203a99f1773309edc3b48e9557914fc4cbac