WIP: 8MP camera issues

Change-Id: I6d910f87a12cca877cd5b2ed5ec547a15d67e2c3