Merge pull request #16878 from dmarcos/bug971086

Bug971086
Bug 966835 - [User story] Add HDR to camera settings
Merge pull request #17153 from singhashish1887/bug966835_HDR_Mode

Bug 966835 - [User story] Add HDR to camera settings
Bug 933902 - [Camera] 1.4 Add zoom functionality