Merge "BufferQueueProducer: fix buffer adjustment during setDequeueTimeout" into qt-dev am: b35167c9eb
am: 2eeb9c6386

Change-Id: I7f69bc79697a30c00864f37c9e2090d8df3aa557