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

Change-Id: I8be9a736bd55971a1d5bda3d0798f56d26c6ff25