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

Change-Id: Ifddeaab9f19d121bf3e77ab08f831255de1b1ad1