Merge "Camera: do not register empty buffer as inflight"