Merge "Camera: Avoid dequeue too many buffers from buffer queue" into tm-qpr-dev