Merge pull request #17095 from justindarc/bug966836

Bug 966836 - [User story] Set ISO mode to auto
Bug 933902 - [Camera] 1.4 Add zoom functionality