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

[TIMOB-18238] Camera Fixes