Misc Camera fixes

Change-Id: Ib4dc754f2da2784fdec866fd2164e72f818c0ea3