camera bugfixes

Change-Id: I5a59ab1bcfc300fc7b3745841e04cac6c89edd9c
Merge remote-tracking branch 'kf/cm-10.1-dev' into cm-10.1-dev