Merge "Camera: Round off Jpeg/R stream size correctly" into udc-dev