Merge "Increase dequeueBuffer timeout"