Bug 988445 - [AirplaneModeHelper] getStatus method does not return rightly

Conflicts:
	apps/costcontrol/js/app.js
	apps/costcontrol/js/widget.js
Bug 989087 - Fix fullscreen app height on attention screen coming
Bug 992345 - [B2G][Lockscreen] Lockscreen appears horizontal instead of vertical on landscape
Merge pull request #18269 from alivedise/bugzilla/989087_v1.4/app-height-on-attention-screen

Bug 989087 - Fix fullscreen app height on attention screen coming, r=timdream
Bug 985369 - Drop updates to the suggestions that have already been superseded

(cherry picked from commit b4d080e6dc8840190adf10e137361ca9af567cb8)
Bug 988316 - enable/disable wifi n gaiatest is polluting the global wifi scopeope and stopping airplane mode from working correctly
Merge pull request #18135 from gaye/bug-974554

Bug 974554 - CalDAV parser should accept ical inside xml comments nested in <calendar-data> elements r=millermedeiros
Bug 989233 - [Bluetooth] Do not connect SCO until user answers incoming call, r=etienne
Merge pull request #18089 from punamdahiya/Bug992426

Bug992426-[Gallery]-Fix of showing images saved from messaging app in gallery r=djf
Merge pull request #18244 from justindarc/bug994426

Bug 994426 - [camera][madai] Options menu items in wrong order
Merge pull request #18243 from jimporter/camera-activity-stay-alive

Bug 994331 - [B2G][Camera] Camera dies and incoming call interface is qu...
Merge pull request #18092 from justindarc/bug989429

Bug 989429 - [Camera][Madai][Buri] When using seeking during video playb...
Merge pull request #18262 from justindarc/bug995632

Bug 995632 - [camera] zoom gesture sensitivity is depends on screen reso...
Merge pull request #18249 from davidflanagan/bug995432

Bug 995432: simple continuous auto focus support r=jdarcangelo(cherry picked from commit 289f131cc65dbf35f69924254a71e76628d2e36d)
Merge pull request #18306 from davidflanagan/bug995432-v1.4

Merge pull request #18249 from davidflanagan/bug995432
Revert "Merge pull request #18249 from davidflanagan/bug995432"

This reverts commit 9021261929e5c07c3d7d5a794d572526fb3fa577.
Bug 960861 - mozMobileConnections should not be requisites for airplane ...
Merge pull request #18307 from qdot/v1.4-960861

Bug 960861 - mozMobileConnections should not be requisites for airplane ...
Merge pull request #18314 from davidflanagan/bug995432

Bug 995432: enable C-AF if the hardware supports it r=jdarcangelo(cherry picked from commit 35ed2ac8d17d373d5e34037bb24e60686561fa84)
Merge pull request #18315 from davidflanagan/bug995432-v1.4

Merge pull request #18314 from davidflanagan/bug995432