Merge "Camera: fix stream ID for failed buffer request"