Merge "Fix setting the dequeueBuffer timeout to -1"