Merge "increase wait timeout and reduce dequeue buffer time-out" into lmp-dev