Merge "Track elapsed time for 'waitStreamEnd' timeout"