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

Conflicts:
	apps/costcontrol/js/app.js
	apps/costcontrol/js/widget.js
Merge pull request #17839 from cvan/updated-mkt

Bug 989470 - Fix MCC/MNC dual SIM detection in Marketplace app
r=julien
(cherry picked from commit 5d81c713215ee1b97996e0bedff87dcd14309eec)
Merge pull request #17214 from qdot/983507-flight-mode-radio-off

Bug 983507 - Make airplane mode icon appear via airplaneMode setting, not RIL status
Merge pull request #17655 from frsela/STK/Bug988362

Bug 988362 - [STK]The maxlength of the inputbox didn't set corretly in GET_INPUT command. (Increment wait time), r=timdream
Merge pull request #18058 from mcav/gelam-tarako

Bug 991567 - [Tarako][Email] Email app is killed while downloading an at...
Merge pull request #16014 from EragonJ/bug-962927

Bug 962927 - [DSDS] After PUK is locked, SIM manager did not show "No SI...
Bug 990802 - Remove animation class correctly
Merge pull request #18094 from EragonJ/v1.4-bug-962927

Merge pull request #16014 from EragonJ/bug-962927
Merge pull request #18097 from alivedise/bugzilla/990802_v1.4/incorrect-open-close-animation

Bug 990802 - Remove animation class correctly, r=timdream
Merge pull request #17936 from wilsonpage/bug/987071

Bug 987071 - [Camera] The screen doesn't going to sleep in the preview g...
Merge pull request #17949 from wilsonpage/bug/991506

Bug 991506 - flash and swap buttons respond to touches even when hidden
Merge pull request #17964 from nullaus/bug981539

bug 981539
Merge pull request #18039 from wilsonpage/991808

Bug 991808 - [camera] remove countdown timer sound
Merge pull request #17992 from wilsonpage/bug/985006

Bug 985006 - [Camera][Madai][QRD Only] Camera Submenu is not displayed properly on rapid back and forth from submenu to camera menu
Merge pull request #17976 from wilsonpage/bug/991924

Bug 991924 - [Camera][Buri] Performance regression when selecting shutter button (camera and video)
Merge pull request #18047 from wilsonpage/991844

Bug 991844 - [Camera][Buri] Blue highlight Ring around Camera doesn't properly
Merge pull request #17630 from steveck-chung/bug-983631

Bug 983631 - [Messages] After deleting a message thread the notification persists forever. r=julienw
Merge pull request #17950 from mcav/stopwatch-l10n

Bug 988057 - [Stopwatch][l10n] Localization of stopwatch is broken. r=gaye
Merge pull request #17982 from lissyx/bug980701

Bug 980701 - Make sure we do not try to place more than two calls r=etienne
Merge pull request #17970 from hyunacho/bug991444

Bug 991444 - [camera][madai] geo-location dialogue not full screen in ca...