Bug 960611 - [Camera] Create mechanism to save/load user settings
Bug 958200 - [Camera] Update Camera app to use new CameraControl API
Merge pull request #16261 from dmarcos/bug960611+bug958200

Bug960611+bug958200