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

Change-Id: Ie4c3901832ef4808db0428a0825c1673c9334f07