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

Change-Id: I5b819594feb66df4725036385b28b7dff646e00f