Bug 993161 - Ensure the value of 'ril.iccInfo.mbdn' is valid when starting up
Merge pull request #18833 from crh0716/993161_v1.4

Bug 993161 - Ensure the value of 'ril.iccInfo.mbdn' is valid when starting up r=jaoo
Bug 999171 - Implement a progress indicator to show progress when the viewfinder has not loaded

Conflicts:
	apps/camera/js/app.js
	apps/camera/js/config/config.js
	apps/camera/js/controllers/controls.js
	apps/camera/test/unit/app_test.js
Merge pull request #18855 from wilsonpage/999171-v1.4

Bug 999171 - Implement a progress indicator to show progress when the
Bug 1000984 - [Camera] Pinch-to-zoom gesture should be attached to the |window| object in the DOM
Merge pull request #18871 from justindarc/bug1000984-v1.4

Bug 1000984 - [Camera] Pinch-to-zoom gesture should be attached to the |...
Bug 1004963 - Update camera tests
Bug 1003746 - Fix the tap_subject() method of email apps
Merge pull request #18886 from chirarobert/v1.4_camera_fix

Bug 1004963 - Update camera tests
Merge pull request #18889 from chirarobert/v1.4_email_uplift

Bug 1003746 - Fix the tap_subject() method of email apps