Merge "Camera: add QCIF resolution exception" into pi-dev