Bug 965145 - [Camera] refactor .sensorAngle patch in bug 947956 for new camera app
Bug 982071 - Unusable Camera app when triggered from pick activity for file upload
Bug 985077 - [Camera][Madai] Unable to take picture against dark surface with flash turned off
Bug 985662 - [Camera][Madai][Mozilla] 1.4 Video recording counter is in wrong position
Bug 978531 - [Camera][Madai] The preview is not available when reopening the camera
Bug 984616 - [Camera][Madai] Short videos don't get saved. Less than a second
Bug 984730 - Camcorder starts with flash light by default
Bug 986266 - zoom control slider is shown on UI
Bug 985236 - [camera][madai] Zoom bar jumps on orientation
Bug 949941 - [Camera] Replace all memory-backed Blob instances with disk-backed File instances after saving to disk so "pick" activity consumers don't break. r=djf
(cherry picked from commit f23f21bc3837fa0726a97575c3efed33371751fc)

Conflicts:

	apps/camera/js/controllers/camera.js
Remove some CSS warnings on the camera app. r=wilsonpage

Conflicts:

	apps/camera/style/controls.css
	apps/camera/style/settings.css
Bug 981341 - Fix type in camera css. r=daleharvey

Conflicts:

	apps/camera/style/controls.css
Merge pull request #17411 from dmarcos/bug984730

Bug 984730 - Camcorder starts with flash light by default
Merge pull request #17342 from justindarc/bug984616

Bug 984616 - [Camera][Madai] Short videos don't get saved. Less than a s...
Merge pull request #17399 from justindarc/bug985236

Bug 985236 - [camera][madai] Zoom bar jumps on orientation
Merge pull request #17394 from wilsonpage/bug/982071

Bug 982071 - Unusable Camera app when triggered from pick activity for file upload
Merge pull request #17401 from wilsonpage/bug/985077

Bug 985077 - [Camera][Madai] Unable to take picture against dark surface...
Merge pull request #17417 from justindarc/bug986266

Bug 986266 - zoom control slider is shown on UI
Bug 986120 - [Camera][Mozilla][Madai][UX] 1.4 Gallery Grid Icon shifts when changing orientation
Merge pull request #17471 from dmarcos/bug986120

Bug 986120 - [Camera][Mozilla][Madai][UX] 1.4 Gallery Grid Icon shifts w...