[TIMOB-18238] Camera Fixes
Merge pull request #41 from vishalduggal/timob-18238-stable

[TIMOB-18238] Camera Fixes