Merge pull request #16969 from dmarcos/bug980599

Bug 980599 - [Camera] Picture and video resolution selection
Bug 980094 - [Camera] Moving setter and enabler methods from controls view to the view base class