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

Change-Id: Id565413b938c57deff206924d6797a49e20fed07