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

Change-Id: I20e60ef6d84c969b1651e449f5a076183d38a7c9