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

Change-Id: I53511f3350360c8b75aaa7c3f481235beadb09b9