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

Change-Id: Ia32a0b1177a5e7160680e1d4c9c40ff23075c431