Merge pull request #16971 from dmarcos/bug980290

Bug 980290 - [Camera] Bytes and pixels shouldn't be used interchangeably
Bug 966839 - [Camera] Add frame grid to camera settings
Merge pull request #16924 from dmarcos/bug966839

Bug966839
Bug 933902 - [Camera] 1.4 Add zoom functionality