Merge "Increase dequeueBuffer timeout" into qt-r1-dev am: 5ab5cd7aa2
am: 6769f25c17

Change-Id: I13931cd14fead1141acbea5cef8deb61a6c9119e