Bug 979234 - [Camera] [Madai] Fix integration tests
Revert "Bug 976407 - [Camera] Only update the preview-size if the resolution for the current mode is changed"

This reverts commit 0a8832a0b3654464526a444205299dae679d5a1a.

Conflicts:
	apps/camera/js/config/app.js
	apps/camera/js/controllers/camera.js
Bug 976407 - [Camera] Only update the preview-size if the resolution for the current mode is changed
Revert "Bug 978984 - [MADAI][Camera] HUD and recording timer visible at same time."

This reverts commit e97339dcb3099510ba2cb7bd2ff030f42f3662d8.
Bug 978984 - [MADAI][Camera] HUD and recording timer visible at same time.
Revert "Bug 979285 - [Camera] Size the viewfinder to fill the device viewport"

This reverts commit f63b0f16717e24928d66294b795977b2421100af.
Bug 979285 - [Camera] Size the viewfinder to fill the device viewport
Bug 976203 - [Camera] Localization (l10n) missing from settings UI

Conflicts:
	apps/camera/js/config/app.js
	apps/camera/js/controllers/settings.js
	apps/camera/js/lib/setting.js