Merge pull request #16971 from dmarcos/bug980290

Bug 980290 - [Camera] Bytes and pixels shouldn't be used interchangeably
Merge pull request #16924 from dmarcos/bug966839

Bug966839
Bug 975910 - [Camera] Hide Setting menu on click of other components of screen