latest changes, fix some camera issues

Change-Id: I7893fbc2c6625d5a7f8b0dfa758547e870731633