Blindly merge jitter buffer patch of bug #4342)